修改数据库
Merge branch 'dev' of https://github.com/Telcommunication/Telc into dev

Conflicts:
	SmartMemo/src/com/telc/ui/Memos/TimingMemoActivity.java