Merge branch 'develop' of github.com:pnpranavrao/ka-lite into develop
Merge remote-tracking branch 'origin/api_url' into install_wizard

Conflicts:
	kalite/settings.py
include CENTRAL_SERVER settings into local_settings file for install, don't refresh page when selecting num_certificates, better error reporting
Merge remote-tracking branch 'origin/api_url' into install_wizard

Conflicts:
	kalite/central/views.py
	kalite/urls.py
bug if the video directory didn't exist
Major redesign of the landing page
code to auto-register offline-installed server; self-generated zone will have to be implemented on another branch that allows that.
don't include XLS files lol
Enabling offline installation where the device generates its own zone.
fixing merge error (still contained unmerged markers)
Merge pull request #103 from pnpranavrao/develop

Solves issue of spaces in install path
working around in-place update (windows folder being locked) by walking the directory structure and copying in files one-by-one.
Stream only the requested certificates.
Merge branch 'contact_ux' into offline_install

Conflicts:
	kalite/urls.py
Stream only the requested certificates.

Conflicts:
	kalite/central/urls.py
	kalite/central/views.py
forgot an import
fixing up urls, don't know why they broke.  TOO MANY BRANCHES
Merge branch 'package_kalite' into update_kalite
fixed bug where django errors if zone_id is __empty__
removing pdb