dynamic graph with direct terms
Merge pull request #1 from vetrolamu/master

update from vetrolamu
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 pull request #2 from vetrolamu/master

update from vetrolamu
Merge pull request #3 from pelikanchik/master

update from master
some changes
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
Fix
Merge pull request #4 from pelikanchik/master

update from master
Delay for show answers button
constructor for direct_term #1
Merge pull request #5 from pelikanchik/alexg

Alexg
Merge pull request #6 from pelikanchik/master

update from master
direct_term save via constructor
Merge pull request #7 from pelikanchik/alexg

Alexg
rusification part 4
translation part 5
Merge pull request #8 from pelikanchik/alexg

Alexg