添加经纬度单位显示，优化显示界面。---lillian
commit
Merge branch 'master' of git@github.com:tclSmartwatch/tcl_smartwatch.git

Conflicts:
	Watch/src/com/tcl/watch/ui/ShowActivity.java
	Watch_orm/bin/watch_orm.jar
Merge branch 'master' of git@github.com:tclSmartwatch/tcl_smartwatch.git

Conflicts:
	Watch/src/com/tcl/watch/ui/ShowActivity.java