Introduced 'ENVIRONMENT' variable to settings.py and wsgi.py
Merge branch 'test'