Fix

Conflicts:
	common/lib/xmodule/xmodule/tests/test_self_assessment.py

(the last couple are still broken, though)

put back the 'position' argument to get_module() which got accidentially...

put back the 'position' argument to get_module() which got accidentially - or so I think - dropped in a previous commit

Fix broken IE due to using the word function

fix merge problem. assign_default_role() ended up being defined twice as...

fix merge problem. assign_default_role() ended up being defined twice as that code was added in both master and cms-master branches, but the merge didn't pick it up as a conflict

add UTC time to registration end date

Make code inline instead of block.

#143

update templates to include attemps and weight values. Also update capa_...

update templates to include attemps and weight values. Also update capa_module.py to accept empty strings ('') to mean 'default value'

Toggling of code should mark editor as dirty.

Do not run the lms jasmine tests on jenkins for now, until we fix them.

Fix/cdodge/remove hide progress tab

Feature/cale/fix staff debug link

studio - resolved bug with .header CSS inheritance and problem editor

staff_problem_info.html is only put on the page for staff, so we don't need to check staff_access inside it