显示版本号
Merge branch 'master' of https://github.com/jinghai/xxyyzz

Conflicts:
	project/IPet/src/com/ipet/android/ui/manager/UpdateManager.java