added mode bar up top
Merge branch 'master' into ux/marco/studio-componentsettings
aria tabs v1
non revision
Adding iframe view

example:
http://localhost:8000/courses/HarvardX/CB22x/2013_Spring/mktg-about
Adding mktg_iframe.html
Merge branch 'master' into ux/marco/studio-componentsettings
changes with aria
edx.org - added in isolated register button styling/states for <iframe>-based registration fix
fixing old about view, iframe updates
edx.org - resolved JQuery submit() method error on <iframe> register button actions
Merge branch 'master' into drupal-new
Add cookie name to the cms settings so we don't error out
while looking for it
added shell of css and html organization
plugged in more pseudo code for various css class states necessary as well as examples for dropdown case and extra logic required there
Merge pull request #1933 from edx/diana/drupal/fix-cms-tests

Drupal: Add cookie name to the cms settings so we don't error out while looking for it
Fix links between marketing site and courseware.

Update links in footer to point to the right pages.
Update link on dashboard without any classes.
Update links in header.
Update links on sign in and register pages.
Add MKTG_URLS to settings for new footer and header links.
Modify course registration flow for new login and registration pages

Now that we are using separate pages for login and registration rather than
modals, clicking the registration button for a course should direct an
unauthenticated user to the registration page, and the user should be enrolled
in the course upon successful registration. Likewise, an unauthenticated user
attempting to unenroll from a course should be directed to the login page and
subsequently unenrolled from the course upon successful login. The enrollment
change service also now uses HTTP status codes rather than JSON to communicate
status to the front end.
Add login link to registration page if user is trying to enroll in a class

If an unauthenticated user clicks on a course registration button, they will
be redirected to the user registration page. Now, that page will include a link
to the login page. If the user follows the link and logs in successfully, then
they will be enrolled in the class.