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

Conflicts:
	Client/Assets/Client.unity
Switch back to build mode after single delete to prevent accidental deletes
Show markers on public screen.