fix wogamewap issue
Merge branch 'master' of https://github.com/yinzhuancheng/WoGame

Conflicts:
	03 Source Code/wogame-web/src/main/webapp/WEB-INF/views/index.jsp
	03 Source Code/wogame-web/src/main/webapp/static/styles/new_main.css