laptop-screen play page
Merge branch 'develop' of https://github.com/meriadec/FollowMyTracks into develop

Conflicts:
	app/styles/main.scss