Fix Bug
Merge branch 'develop' of https://github.com/jdugue/ghome into develop

Conflicts:
	webghome/hexanhome/templates/base.html