small changes
Merge branch 'develop' of github.com:SaltySoft/sitemti into develop

Conflicts:
	app/boot.js