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

Conflicts:
	gameplay/js/model/hexgrid_impl.js
Merge branch 'master' of https://github.com/reedcwilson/catan
Fixed Console.logs
Merge branch 'master' of https://github.com/reedcwilson/catan