making getting system user more robust
Merge pull request #82 from bcipolli/django_locale_bug

Avoid installation failure when locale cannot be determined
Use M2Crypto's PBKDF2 (if available) for password-hashing, for efficiency

Woooo 40x speedup on the Pi!
Decrease the number of password-hashing iterations for student accounts.
Fixes to address requests in code review #84.

https://github.com/learningequality/ka-lite/pull/84
Removed use_m2crypto argument as requested in pull request #84.
Cleaned up PBKDF2 code for review #84.
Merge pull request #84 from jamalex/m2crypto_password_hashing

M2Crypto password hashing
Finally found the place where slug_key and title_key belong: utils/topics.py, where they already are\! :D
central server side: scrub username before saving to be lower.  intercept login requests, try the lcase version, fall-back to the actual-case version
make sure to validate both ways (lowercase, and mixed case), before creating the user
using more standard implementation, also double-validating email (lower and mixed case) in form
Merge remote-tracking branch 'origin/case_free_usernames' into IDOC_demo

Conflicts:
	kalite/registration/views.py
	kalite/securesync/models.py
Merge remote-tracking branch 'origin/settings_only' into IDOC_demo

Conflicts:
	kalite/settings.py