Merge pull request #1 from Aomeas/dev

Dev
network bases
Merge https://github.com/Aomeas/GameFrameworkDev into dev

Conflicts:
	GameFramework/src/network/Client.java
	GameFramework/src/network/Server.java