Remove hot fix because json is fixed on central server.
Merge pull request #2270 from cpauya/feature/1985-generaterealdata-fails-in-model-generation-2

Hot fix for #1985 to make `generaterealdata` management command work.
finished linking new navigation into base.html
fixed merge conflict upstream
remove subtitle from list of playlist ids
remove subtitle from list of playlist ids
Merge branch 'nalanda-rct2' into nalanda-rct3

Conflicts:
	kalite/coachreports/tests/coachreport_tests.py
	kalite/control_panel/tests/control_panel.py
	kalite/distributed/tests/browser_tests/base.py
fix wrong reference of default_username to default_student_username
fix test id used for unit tests
really, we should not be doing assertion errors in utility functions.
Quick initial integration of software keyboard into KA Lite exercises.

Conflicts:
	kalite/distributed/templates/distributed/exercise.html
	kalite/static/js/khan-exercises/khan-exercise.js
	kalite/static/js/khan-exercises/utils/answer-types.js
Moves software-keyboard to new location.
Implements first pass of Backbone driven software keyboard.

Conflicts:
	kalite/distributed/static/css/distributed/khan-lite.css
Makes numpad appear for all applicable answer types.
Fixes on screen keyboard to only appear for Android devices.
Removes erroneously included file.
Adds modernizr.js as static library and to base.html import.
Fixes styling for keypad buttons to make not as high.
Allows toggling of keypad, with auto-toggled off if modernizr.touch is false.

Conflicts:
	kalite/distributed/static/css/distributed/khan-lite.css
Fixes variable and function names to underscore convention.
Changes TODOs to TODO-BLOCKERs.
Adds styling for keyboard that does not rely on bootstrap.

TODO-BLOCKER (rtibbles): Undo these commits before 0.13.