Merge branch 'dev'
Django_nose problem with GAE
Django 1.7
Merge branch 'master' into dev
pytz update