统一代码
Merge branch 'dev' of github.com:Telcommunication/Telc into dev

Conflicts:
	SmartMemo/src/com/telc/domain/time/Service/TimeService.java
	SmartMemo/src/com/telc/resource/baidumap/baiduMapActivity.java