修改classpath
Merge branch 'dev' of https://github.com/Telcommunication/Telc into dev
解决冲突
Conflicts:
	SmartMemo/.classpath
实时备忘录，定时备忘录，数据层
Merge branch 'dev' of https://github.com/Telcommunication/Telc into dev

Conflicts:
	SmartMemo/.classpath
	SmartMemo/AndroidManifest.xml
	SmartMemo/src/com/telc/domain/Emtity/User.java
	SmartMemo/src/com/telc/domain/IService/IUserService.java
	SmartMemo/src/com/telc/domain/Service/UserService.java
	SmartMemo/src/com/telc/ui/systemManagement/LoginAndRegisterActivity.java
解决冲突