init game
account
modify
commit
commit
Merge branch 'master' of https://github.com/linking12/WeiChat.git

Conflicts:
	src/main/java/net/chat/controllers/MessageController.java
	src/main/java/net/chat/dao/WxAccountDao.java
	src/main/java/net/chat/service/AccountService.java
	src/main/java/net/chat/service/impl/AccountServiceImpl.java
	src/main/java/net/chat/service/impl/MessageServiceImpl.java
	src/main/webapp/WEB-INF/views/msg/messageList.jsp
	src/main/webapp/WEB-INF/views/msg/textDetail.jsp