button files
Merge remote-tracking branch 'origin/master'

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