adding field 'version' on device
Fix initial handshake with central servers; takes potentially two steps now.
Merge remote-tracking branch 'upstream/develop' into syncing_models

Conflicts:
	kalite/securesync/api_client.py
	kalite/settings.py
small Django tweak to make usernames 75 chars long.  In order to work with old installationa and new installations, generated a django.contrib.auth schema change, but put it under the registration folder.
adding comments
Merge remote-tracking branch 'upstream/develop' into syncing_models

Conflicts:
	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/urls.py
	kalite/settings.py
moving package changes to common file
Fix typeo in formatting string
Merge pull request #171 from bcipolli/syncmodels_typo

Fix typeo in formatting string
resolve central server browser test fails
Merge branch 'username_length' of git://github.com/bcipolli/ka-lite into bcipolli-username_length

Conflicts:
	docs/DJANGO-CHANGES.txt
	kalite/settings.py
Merge pull request #11 from gimick/KA_test_lite

resolve central server browser test fails
Merge pull request #138 from bcipolli/KA_test_lite

KA Lite browser test framework
documentation changes and cleanup based on code review.  Also made syncmodels use CommandError for nicer output.
un-skipping v0.9.3
Merge remote-tracking branch 'upstream/develop' into syncing_models

Conflicts:
	kalite/securesync/management/commands/syncmodels.py
	kalite/settings.py
fixing bug in passing version
backing out change to zip; not necessary, and caused errors.
more comments to specify how to use versions, and what's used where (and why\!)
Merge branch 'syncing_models' into KA_test

Conflicts:
	kalite/central/tests/browser_tests.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/settings.py