nova home
Merge branch 'master' of https://github.com/giullianomorroni/Portal

Conflicts:
	src/portal/settings.py
conf