Merge branch 'feature/server_connection' into develop
Merge branch 'develop' into feature/server_connection
Merge remote-tracking branch 'origin/citrus' into feature/server_connection
Merge remote-tracking branch 'origin/citrus' into feature/server_connection
Adds all the remaining data types and updates the GameManager for the first steps
Merge remote-tracking branch 'origin/citrus' into feature/server_connection

Conflicts:
	src/Main.as
	src/infrastructure/RemoteOperation.as
Merge branch 'feature/server_connection' into citrus