some
+
Merge branch 'master' of https://github.com/Grapheme/lessad

Conflicts:
	app/config/localhost/app.php
Merge branch 'master' of https://github.com/Grapheme/lessad