修复时间字段
modify
Merge branch 'master' of github.com:momoplan/petandroid1

Conflicts:
	src/petcircle/activity/MainActivity.java
	src/petcircle/activity/contacts/FourActivityForLinkMan.java
	src/petcircle/activity/message/ChatActivity.java
	src/petcircle/activity/message/MessageListActivity.java
	src/petcircle/adapter/GreetListViewAdapter.java
	src/petcircle/constants/Constants.java
	src/petcircle/data/service/HttpService.java
	src/petcircle/data/service/XmppService.java
	src/petcircle/utils/common/SendMsgToHandler.java