aligning hearts
Merge branch 'develop' of https://github.com/meriadec/FollowMyTracks into develop
Merge branch 'develop' of https://github.com/meriadec/FollowMyTracks into develop
stuff cool
Merge branch 'develop' of https://github.com/meriadec/FollowMyTracks into develop

Conflicts:
	app/views/partials/play.html