Django>1.5 ALLOWED_HOSTS setting
Merge branch 'update_dependencies' into develop