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

Conflicts:
	Sketchr/application/config/config.php