modification from git1.
Merge branch 'master' of https://github.com/Flyingdeer/remotedb

Conflicts:
	iphone alarm.txt