synced with the latest ta code, fixed images
Merge branch 'master' of https://github.com/whauwiller/catan-web-client

Conflicts:
	gameplay/js/map/MapOverlay.js
	gameplay/js/setup/SetupRoundController.js
Merge branch 'master' of https://github.com/whauwiller/catan-web-client