correcao do merge
Merge branch 'master' of https://github.com/Gennium/Climbstreets

Conflicts:
	ClimbStreets/ClimbStreets.xcodeproj/project.pbxproj

ClimbStreets/ClimbStreets.xcodeproj/project.xcworkspace/xcuserdata/4g.xc
userdatad/UserInterfaceState.xcuserstate

ClimbStreets/ClimbStreets.xcodeproj/xcuserdata/4g.xcuserdatad/xcdebugger
/Breakpoints_v2.xcbkptlist