Done
Merge branch 'master' of https://github.com/infoyou/iLife

Conflicts:
	iLife.xcodeproj/project.pbxproj