Conflicts:
	djangoapps/student/views.py

This fixes the regression from javascript rewrite.

`PyFilesystem` has the package name of `fs`

Rewrite javascript on the main.html

Both feedback form and calculator interaction now in its own class.

Videos now support annotations w/o verticals

Draws histogram for scores

Remove the csrf domain from the default settings because we don't need i...

Masquerading works

Remove the csrf domain from the default settings because we don't need it (we don't have requests going between multiple servers in the same domain). This will make it so that we can test servers from any url, rather than just a single url

Remove some race conditions in user signups

Re-raise an integrity error during user creation if it's not caused by something we know to check for

Add a settings file for doing grabs for main_static. We may want to add COURSEWARE_ENABLED=False

Catch user integrity errors, and then try and figure out what caused them (which removes a race condition)

Rl announcement

Use inline if-else to cleanup HTML

Allow anonymous user access to the site. Requires guest_courses.xml and info/guest_updates.html to be set created in the data repository