Resolving merge conflict between master and release

jquery.immediateDescendents cannot be loaded until jQuery is loaded.

hotfix-2014-08-12

STUD-1999

Remove hardcoding of key syntax for base url

Studio: Refactoring font-size CSS rules to use Sass mixins/placeholders

* moving font-size to use @include font-size() mixin
* re-organizing vendor reset styling into _vendor.scss override rather than _reset.scss
* initial rule re-organization and minor line-height tweaks

Ignore errors on rmtree cleanup

Unit tests don't need assets

Clean out the mako temp dirs before running tests

Factor out Optimizely project ID

Update settings so unit tests pass

ECOM-63

ECOM-41

- Changes registraiton button text for professional ed courses
- Professional ed courses do not see "choose your track" page; go straight to verification flow

Studio: Refactoring font-weight CSS rules to use Sass placeholders

Remove banner from instructor dashboard

Release notes - 8/12/14

Fix for empty imsx_messageIdentifier

WIP: Documentation for Publishing Changes

Improve stability of test_studio_outline tests.

add how to file a bug report link to readme

Capture console log on lettuce test failure

Ahodges/documentation/doc804

Enforce type of the XBlocks Fields when set

Update testing.md