Added console functionality
Merge branch 'console' into dev

Conflicts:
	public/views/game.html