run
fix error
Merge branch 'master' of https://github.com/wyTrivail/game2.0

Conflicts:
	src/main/java/com/game/Main.java
	src/main/java/com/game/base/ISession.java
	src/main/java/com/game/base/SessionFactory.java
	src/main/java/com/game/load/IUser.java
	src/main/java/com/game/load/impl/User.java
	src/main/java/com/game/playmodel/client/PlayModelControllerFactory.java
	src/main/java/com/game/playmodel/client/pvp/PVPModel.java
Merge branch 'master' of https://github.com/wyTrivail/game2.0