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

Conflicts:
	iOS/ibikecph/ibikecph/en.lproj/MainStoryboard_iPhone.storyboard