changed android compatility + dashboard window
Merge branch 'master' of https://github.com/dyrehauge/fitnessApp into dyrehauge

Conflicts:
	Resources/ui/map.js