Do not double-append the XML path in caps module

Anonymous user

This fixes the bug in answers reset feature

Conflicts:
	rakefile

Conflicts:
	djangoapps/courseware/module_render.py
	djangoapps/courseware/modules/capa_module.py

Grade refactor

Pmitros/xmod reuse refactor

added questions to faq

This fixes the regression from javascript rewrite.

`PyFilesystem` has the package name of `fs`

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

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

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

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