feature commit
Merge branch 'bugfix' into develop

Conflicts:
	html/home.html