Merge branch 'production' into dev
updated django admin media link in nginx conf
Merge branch 'dev' into production