“下载下来”
Merge branch 'dev' of https://github.com/Telcommunication/Telc into dev

Conflicts:
	SmartMemo/project.properties
Merge branch 'dev' of https://github.com/Telcommunication/Telc into dev
"tijiao "
"tijiao"
Merge branch 'dev' of https://github.com/Telcommunication/Telc into dev

Conflicts:
	SmartMemo/src/com/telc/ui/Memos/TimingMemoActivity.java
	SmartMemo/src/com/telc/ui/main/viewModel/UnfinishFragment.java
重新检测

开始
Merge branch 'dev' of https://github.com/Telcommunication/Telc into dev

Conflicts:
	SmartMemo/src/com/telc/ui/main/viewModel/UnfinishFragment.java
	SmartMemo/src/com/telc/ui/other/UpdateUserActivity.java