Fixed the client-server, uid's are now properly implemented.
GameFrames are updating as they should
Merge branch 'develop' of https://github.com/mrwinton/TheExcellentAdventure into develop

Conflicts:
	src/main/Main.java