Fi
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/templates/@layout.latte
	app/templates/Homepage/default.latte