Revert "2014-06-17"

This reverts commit ef6e65d70daa59c2395bc2c5ca4f6071a3cba105.

Conflicts:
	xpjtMsgMemo/AppDelegate.m