下班回家了
Merge branch 'master' of https://github.com/inonomori/photo2go

Conflicts:
	Photo2GO/en.lproj/MainStoryboard.storyboard