first person prompted to build settlement
Merge branch 'master' of https://github.com/abe-austin/Catan

Conflicts:
	java/src/client/map/MapController.java