update
Merge branch 'master' of https://github.com/smallandbeautiful/beautiful-demo

Conflicts:
	beautiful demo.xcodeproj/project.xcworkspace/xcshareddata/beautiful
demo.xccheckout
update