adding pytz module (dependency)
added ASCII art logo
Merge pull request #75 from mrshu/asciiart_logo

added ASCII art logo
migrate from local_or_ to getattr
oops, TEMPLATE_DEBUG should default to DEBUG, not 'DEBUG'
Merge pull request #61 from bcipolli/urls

Abstracting urls/emails/securesync protocol
Merge remote-tracking branch 'upstream/develop' into api_url

Conflicts:
	kalite/settings.py
Merge remote-tracking branch 'upstream/develop' into pytz
removing heavy cruft
made non-use of settings.CENTRAL_SERVER_HOST fall back to that value.
removing some ugettext refs; moving some imports in other places
fixing bug from previous checkin.  sigh.
copied django's changepassword.py tool, modified to use facilityuser
allow password generation (currently for testing purposes), and add test cases
Merge pull request #79 from bcipolli/cleanup_youtube_data

We need this for the test server, to save space.
Merge pull request #83 from bcipolli/command_line_password_recovery

Tool for changing local user passwords
Merge branch 'hotfix' into develop
Merge pull request #72 from bcipolli/pytz

Adding pytz to python-packages
Merge remote-tracking branch 'upstream/develop' into api_url
Merge remote-tracking branch 'origin/api_url' into auto_register

Conflicts:
	kalite/securesync/views.py