addFavPage
Merge branch 'Mot' into Camera&edit

Conflicts:
	picmot.xcodeproj/project.pbxproj
	picmot.xcodeproj/project.xcworkspace/xcshareddata/picmot.xccheckout
	picmot/Base.lproj/Main.storyboard