修改垃圾箱图标的大小
测试定时提醒是否可运行
Merge branch 'dev' of github.com:Telcommunication/Telc into dev
dasdadasfsd
准备做定时提醒的后台监听
Merge branch 'dev' of github.com:Telcommunication/Telc into dev

Conflicts:
	SmartMemo/project.properties
	SmartMemo/src/com/telc/ui/main/viewModel/UnfinishFragment.java
pull
定时提醒完成。
Merge branch 'dev' of github.com:Telcommunication/Telc into dev

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