Annotation & station markers update
Merge branch 'master' of https://github.com/nmarkovic04/Cykelsuperstier-fork

This reverts commit 39f3632b0a5029fd430bfec70aff0ae846f7cde8.

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