Update
Merge branch 'master' of https://github.com/skeelr/raclette

Conflicts:
	footer.php
	header.php
	less/style.less