gui
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gamecenter/nbproject/project.properties
	Gamecenter/src/Frontend/Scripts/gui.js
	Gamecenter/web/index.html