More changes
Merge branch 'master' of https://github.com/reedcwilson/catan

Conflicts:
	gameplay/js/GameplayConnections.js