重新检出代码

重新检出代码
Merge branch 'dev' of https://github.com/Telcommunication/Telc into dev

Conflicts:
	SmartMemo/project.properties
	SmartMemo/src/com/telc/domain/Service/locationService.java
	SmartMemo/src/com/telc/ui/Memos/RealtimeMemoActivity.java
重新检出
Merge branch 'dev' of https://github.com/Telcommunication/Telc into dev
"关于Activity"

"关于Activity"已完成，请子为及时美化界面
Merge branch 'dev' of https://github.com/Telcommunication/Telc into dev

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