Add ALLOWED_HOSTS to production settings.
Normalize line endings
Merge master