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

Conflicts:
	iOS/ibikecph/I Bike CPH.xcodeproj/project.pbxproj
	iOS/ibikecph/ibikecph/Classes/SMBreakRouteViewController.m
	iOS/ibikecph/ibikecph/Classes/SMTransportationLine.h
	iOS/ibikecph/ibikecph/en.lproj/MainStoryboard_iPhone.storyboard
	iOS/ibikecph/ibikecph/stations.json
	iOS/ibikecph/ibikecph/transportation-lines.json