Merge branch 'master' into settings

Conflicts:
	gInbox.xcodeproj/project.pbxproj

gInbox.xcodeproj/project.xcworkspace/xcuserdata/chenasraf.xcuserdatad/Us
erInterfaceState.xcuserstate
	gInbox/Base.lproj/MainMenu.xib
	gInbox/MainMenu.xib
	gInbox/en.lproj/MainMenu.xib