Development
Change server ip
Merge branch 'master' into dev

Conflicts:
	.gitignore
	client.html
	client/_client.html
	client/assets/js/javascript.js
	client/client.html
	client/client.php
	client/index.php
	server/src/Game/Character.php
	server/src/Game/Game.php
	server/src/GameServer/CommandMapper.php
	server/src/GameServer/CommandProcessor.php
	server/src/GameServer/MoveCommand.php
	server/src/GameServer/SayCommand.php
	server/src/GameServer/Server.php
	server/src/GameServer/iCommand.php
	server/test.sh