Station markers scaling. Bug fixes
Merge branch 'master' of https://github.com/nmarkovic04/Cykelsuperstier-fork

Conflicts:
	iOS/ibikecph/I Bike CPH.xcodeproj/project.pbxproj
Merge