separated code, adjusted things, colors
Merge branch 'master' of https://github.com/jordannick/shuttle

Conflicts:
	Resources/app.js
Merge branch 'master' of https://github.com/jordannick/shuttle