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

Conflicts:
	gameplay/Tests/ProxyUnitTests.js
	gameplay/js/roll/RollController.js
+Added the Observer Pattern.  It is called every 5 seconds.
+Did some work on the communications controllers
+Changed the Roll Controller class so that if you hit the roll button it clears the interval
+Changed $ to jQuery in the Roll Overylay (incase Dr. Snell gets mad at it)