front fixes
Merge branch 'master' of github.com:MrRuru/smoothie

Conflicts:
	views/layout.haml
handling track finished event