Fixed a lot of bugs in the client model and proxy area.  This will now load the resources on the side of the map.  I feel like everything is supposed to load without us doing any controllers so I don't know.
Running completeTests still runs an error.
Merge branch 'master' of https://github.com/reedcwilson/catan

Conflicts:
	gameplay/Tests/CompleteTests.html
	gameplay/Tests/clientModelTests.js