modal
Merge branch 'develop' of github.com:meriadec/FollowMyTracks into develop

Conflicts:
	app/scripts/controllers/record.js
starting modal core
changes
Merge branch 'develop' of github.com:meriadec/FollowMyTracks into develop