Conflicts:
	cms/envs/common.py

Import requireJS.

Feature/christina/tiny mce

caveats: - it drops wherever the y of the cursor is no matter the x for
the cursor. I've constrained the draggables to never change x; so, the
drop doesn't care where the x of the cursor is only the y.
- if you force auto scroll, the visual thing you'll dragging gets out of
sync w/ the mouse cursor; however, the mouse cursor is the "true"
location; so, the drop's posit is the mouse cursor y not the visual
clone's y.

use property rather than referencing the metadata dictionary. This is be...

add optional course_id parameter to DraftMongoStore.get_items()

Feature/jarv/certificate force update

use property rather than referencing the metadata dictionary. This is better because if there is no 'display_name' defined, then we get back a string of the location name

Fix handling of openid provider requests that use POST

CMS Master

Unit drag and drop works correctly now.

Conflicts:
	cms/static/css/tiny-mce.css

studio html editor - revised header styles for editing/displaying HTML components (including separating studio editing chrome from style rules)

Anonymous users don't have an email attribute, and shouldn't be checked ...

Conflicts:
	cms/static/js/base.js
	cms/static/js/hesitate.js

Added some symmath comments

Content/rocha/lewin announcement