赵康提交
Merge branch 'dev' of https://github.com/Telcommunication/Telc into dev

Conflicts:
	SmartMemo/.classpath
	SmartMemo/AndroidManifest.xml