ss
Merge branch 'master' of https://github.com/appdios/test1

Conflicts:
	Bolo/Bolo.xcodeproj/project.xcworkspace/xcshareddata/Bolo.xccheckout