Merge branch 'hotfix-1.2.0'
Removed Django SSLify
Enabled SECURE_PROXY_SSL_HEADER to trust Heroku Proxy
Set cookies to expire with browser close
Merge branch 'hotfix-1.2.1' into develop