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.
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.
Add Bootstrap.
Set Grid system.
System update done.
steps 1 and 2 prototyped: package kalite, unpack, and run install.  Next: step 3, registration handshake
3 pic version.
Three images ready.
Fix paragraph height issue.
Add links to each buttons. Solve color conflits from Khansite.css
Merge branch 'update_all' of https://github.com/bcipolli/ka-lite into update_all

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge branch 'update_all' of github.com:bcipolli/ka-lite into install_with_zone_new

Conflicts:
	.gitignore
Merge branch 'release-0.10' of git://github.com/learningequality/ka-lite into install_with_zone_new
Merge branch 'katest_tool' of github.com:bcipolli/ka-lite into install_with_zone_new