stop sprint
Merge branch 'master' of https://github.com/minardi/SSTTv2-server

Conflicts:
	app/views/layouts/application.html.erb