Merge branch 'release-0.10' of git://github.com/learningequality/ka-lite into develop
Merge branch 'develop' into subtitles_immediate_fix
Fixed Nginx comments to the right style.
Merge pull request #468 from jamalex/nginx_config

Added management command to display Nginx frontend proxy config.
Add Bootstrap.
Added ability to specify in settings to only run fast tests.
Upgrade Selenium to get JS error detection to work properly in new FF.
Merge pull request #7 from jamalex/exercisedescriptionerror

Added ability to specify in settings to only run fast tests.
Now generating individual download_status json files.
I do believe the conversion from massive download_status files to individual ones is complete. #feelinglikeaninja
Fixing small bugs
Removed reference to sourcemap file "backbone-min.map" to avoid 404's.
Merge pull request #480 from bcipolli/cron__file__

fixing __file__ reference in cronserver.py
Merge pull request #488 from jamalex/remove_backbone_sourcemap_reference

Removed reference to sourcemap file "backbone-min.map" to avoid 404's.
Merge branch 'release-0.10' of github.com:learningequality/ka-lite into develop
Merge branch 'develop' of github.com:learningequality/ka-lite into mplayer_launcher

Conflicts:
	kalite/main/api_views.py
	kalite/main/views.py
	kalite/settings.py
	kalite/static/js/videoplayer.js
	kalite/templates/video.html
Merge pull request #9 from bcipolli/subtitles_immediate_fix

Fixing small bugs
updating based on code reviews, more fully merging with existing changes
Set Grid system.
(I think I..) fixed the subtitle counts bug.