Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/foldit_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	common/lib/xmodule/xmodule/tests/test_conditional.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py

Hotfix/dave/missing npoints

Fix issue where javascript was disappearing from problem html

Fixed checkbox bug in capa_module

add comments

need to support link references to static content that is in the code ba...

Fix/will/mc checkbox bug

New version of Backbone has separate invalid event.

Disable Django toolbar-- breaking mongo updates.

but the answer is incorrect.

make export a bit more resilient. If there's a piece of metadata that we...

make export a bit more resilient. If there's a piece of metadata that we can't serialize - i.e. someone wrote a new bool attribute and didn't put it in the type mapping table - then we log the exception and continue.

so that: a) checks/x marks appear after each option
for radio buttons, b) checks/x marks appear for the
entire problem (not individual options) for checkbox
buttons.

Also fixed issue with checks appearing on the next line
by changing <text> to display:inline instead of display:block

Fix/will/merge jnater unittests

remove getting of descriptor. location isn't defined here so it blows up. Anyhow, the descriptor is being passed into the function, so we don't need to fetch...

Hotfix/jkarni/folditscore

Fix max_attempts=''

That's what studio defaults to, and recent changes made it break.
Added a few tests to make sure it doesn't happen again.

remove links to missing image files.  We can add them if needed later.

Added documentation for drag and drop - targets on draggables feature.

add textbook and pdf textbook documentation

Feature/jkarni/genex