Merge branch 'master' of https://github.com/luttigdev/SafeRoute

Conflicts:
	SafeRoute.xcodeproj/project.pbxproj
	SafeRoute/FirstViewController.m
cmt2
cmt3
cmt4