adjust structure of project
Merge commit 'a60fbfe2db51afac6e66626710670845f286aec1'

Conflicts:
	focus.xcodeproj/project.pbxproj
	focus.xcodeproj/project.xcworkspace/xcuserdata/po-hsianghuang.xcuserdatad/UserInterfaceState.xcuserstate
	focus.xcodeproj/xcuserdata/po-hsianghuang.xcuserdatad/xcschemes/focus.xcscheme
	focus.xcodeproj/xcuserdata/po-hsianghuang.xcuserdatad/xcschemes/xcschememanagement.plist
	focus/Base.lproj/Main.storyboard