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

Conflicts:
	iOS/ibikecph/ibikecph/SMViewController.m
Merge branch 'master' of https://github.com/nmarkovic04/Cykelsuperstier-fork

Conflicts:
	iOS/ibikecph/ibikecph/SMViewController.m