add options to cronserver for memory profiling and garbage collection, to address github issue 111 (unbounded memory usage)
main changes didn't take :( in git
Fix Error message alinment issue
Merge remote-tracking branch 'upstream/develop' into install_wizard

Conflicts:
	kalite/central/forms.py
	kalite/central/urls.py
	kalite/central/views.py
	kalite/main/urls.py
	kalite/registration/views.py
	kalite/securesync/api_client.py
	kalite/securesync/api_views.py
	kalite/securesync/management/commands/retrypurgatory.py
	kalite/securesync/management/commands/syncmodels.py
	kalite/securesync/models.py
	kalite/securesync/views.py
	kalite/settings.py
	kalite/templates/central/base_central.html
	kalite/templates/central/landing_page.html
	kalite/templates/registration/registration_form.html
	kalite/templatetags/my_filters.py
Implemented Bootstrap and JQuery UI.
Merge branches 'master' and 'master' of https://github.com/learningequality/ka-lite into develop

Conflicts:
	README.md
display none for # of depolyment
Download button states switchable.
Got the check value function ready.
Adding internet suggestion notes.
New ui for non-login user.
ignore virtualenv generated directories
Merge remote-tracking branch 'upstream/develop' into develop
updates module, with tests, sans UI (will extract from video_download
adding comments, removing cruft, a small code switch for safety.
Merge branch 'checkconnection' of github.com:bcipolli/ka-lite into updates_app

Conflicts:
	kalite/main/api_views.py
	kalite/settings.py
secondary checkin; most of the functionality is there.
cleanup of interactions (just missing a 'waiting to begin' message)
pointing subtitles client at ourselves.
hardcoding playground