commit
Merge branch 'master' of https://github.com/lamottin/sketchr

Conflicts:
	Sketchr/application/views/hf/footer.php
	Sketchr/application/views/hf/header.php