added config popup in game.js
merging
Merge branch 'working'

Conflicts:
	web-ui/src/main/webapp/js/game.js