Secure websocket connection failure
Merge branch 'master' of github.com:avaus/GameDemo
Merge branch 'master' into devel

Conflicts:
	client/app/scripts/game.js