2
ver2

ver2
camera

action sheet add
addedSection

- Sectionに変更
- Favorite項目追加
movedPlist
Merge branch 'moveToPlist' into Mot
addedFuncTapHidden
addedAddFunction
frist

server side
second

second
last

finish
addFavoriteView
Merge branch 'addFavorite' into Mot
Merge branch 'Mot' into Camera&edit
addFavPage
Merge branch 'Mot' into Camera&edit

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

third
teat

teat marge
chihiro and yuki

change
Merge branch 'Server' into Camera&edit

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