Started rework of sockets
Figured out node out finally!
Merge branch 'bdbtzc_sprint3' of https://github.com/MUSWE/Risk into ahnera_sprint3

Conflicts:
	protected/views/game/_overview.php
disconnect
Merge branch 'ahnera_sprint3' of https://github.com/MUSWE/Risk into bdbtzc_sprint3

Conflicts:
	node/index.js
Update join button