Merge branch 'develop'

services/proxy/default-ssl.conf

services/webapp/code/rosetta/auth.py

services/webapp/code/rosetta/context_processors.py

services/webapp/code/rosetta/core_app/templates/account.html

...es/webapp/code/rosetta/core_app/templates/navigation.html

services/webapp/code/rosetta/core_app/utils.py

services/webapp/code/rosetta/core_app/views.py

services/webapp/code/rosetta/settings.py

services/webapp/code/rosetta/urls.py

services/webapp/requirements.txt