asdasd
asdas
Merge branch 'master' into HEAD

Conflicts:
	src/main/java/com/we/GameBean.java
changes in table.jsp