Merge branch 'master' of https://github.com/MaartenvE/game1 into MaartenvE-master

Conflicts:
	Client/Assets/Client.unity