“TimeService可用，TimingMemoActivity修改，暂不成熟”
TimingMemoActivity可用了

TimingMemoActivity可用了
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
	SmartMemo/src/com/telc/ui/Memos/TimingMemoActivity.java