pulse button
Merge branch 'next' of github.com:StarTrack/server into next

Conflicts:
	app/assets/stylesheets/main.less
	app/views/main.scala.html