dynamic graph with direct terms
json for direct term Merge branch 'master' of https://github.com/pelikanchik/edx-platform

Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/js/src/capa/display.coffee
Merge branch 'master' of https://github.com/vetrolamu/edx-platform

Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/js/src/capa/display.coffee
	common/lib/xmodule/xmodule/js/src/sequence/display.coffee
	lms/templates/problem_ajax.html
Merge branch 'master' of https://github.com/vetrolamu/edx-platform
Merge branch 'master' of https://github.com/pelikanchik/edx-platform