info
Merge branch 'master' of https://github.com/luomuwen/map_agent

Conflicts:
	config/defaultdb.properties
	config/service.xml
	src/com/wk/msgMonitor/MsgDataDao.java
	src/com/wk/msgMonitor/MsgDataDaoService.java
	src/com/wk/msgMonitor/MsgDataInfo.java
	src/com/wk/msgMonitor/ReceiveMsgDao.java
	src/com/wk/msgMonitor/ReceiveMsgDaoService.java
	src/com/wk/msgMonitor/ReceiveMsgInfo.java
	src/com/wk/msgMonitor/SendMsgDao.java
	src/com/wk/msgMonitor/SendMsgDaoService.java
	src/com/wk/msgMonitor/SendMsgInfo.java
info