adding schema change
Merge branch 'package_kalite' into KA_test

Conflicts:
	kalite/settings.py
	kalite/urls.py
Merge branch 'offline_install' into KA_test

Conflicts:
	.gitignore
	kalite/central/urls.py
	kalite/settings.py
	kalite/urls.py
Merge branch 'offline_install' into KA_test

Conflicts:
	.gitignore
	kalite/central/urls.py
	kalite/settings.py
	kalite/urls.py
Adding test runner to force liveserver testing; restructured securesync tests, added decorators to distinguish main vs central server tests
Merge branch 'package_kalite' into KA_test
closer to finishing the ecosytem config
Merge branch 'update_kalite' into KA_test

Conflicts:
	kalite/settings.py
get loadtesting to be a test, and only come into the codepath when it's available.
make test runner available only in debug code, move into 'tests' code
forgot another pdb
The ecosystem works\!  Now just got to get them on the same zone.
Merge branch 'KA_test' of github.com:bcipolli/ka-lite into KA_test

Conflicts:
	kalite/settings.py
Merge branch 'offline_install' of github.com:bcipolli/ka-lite into offline_install
updating default facility string
original url and form name restructuring, basic zone management template added
adding demo buttons, to share basic ideas with @arnaudbenard
Merge pull request #104 from bcipolli/start_any_port

Allow port to be specified from the command-line
New interface for zone_management.html
Merge pull request #3 from arnaudbenard/central_server_stats

New interface for zone_management.html