minor fixes
fixes
Merge branch 'master' of https://github.com/nmarkovic04/Cykelsuperstier-fork

Conflicts:
	iOS/ibikecph/I Bike CPH.xcodeproj/project.pbxproj
	iOS/ibikecph/ibikecph/Classes/SMStationInfo.h
	iOS/ibikecph/ibikecph/Classes/SMStationInfo.m
	iOS/ibikecph/ibikecph/Classes/SMTransportation.m
	iOS/ibikecph/ibikecph/en.lproj/MainStoryboard_iPhone.storyboard