lcw

sync
Merge branch 'master' of github.com:TeamOfFBAuto/OneTheBike1025

Conflicts:
	OneTheBike.xcodeproj/project.pbxproj