clear garbage
add html
arrange
arrange
Merge branch 'master' of https://github.com/chrisbing/game-fc

Conflicts:
	game-server/game-fc/target/m2e-wtp/web-resources/META-INF/maven/com.happyelements.game/game-fc/pom.properties