文案

文案
Merge branch 'master' of https://github.com/boyweb/ThreeDiors.Hey.140624.2330

Conflicts:
	testnoti/testnoti/testnoti-Info.plist