Merging Damiens work

tried merging damiens updates, but git said I had to commit my changes
or else I would lose them. This commit can be disregarded.
Adding GUIs like crazy

+Keep creating GUIs
+Created function so MapEvent can call the game controller when an event
occurs. Function is called DoAction( str eventtype, str resourcetype ).
Resource type can be null if eventype does not require a resource.
Added Movement GUI No integration

+Added Movement GUI but no integration. +Changed the Dice Roll to 1 die
6 sides.
+Added End Turn Button for PathToTake

Left to do:
Just waiting on movement controls and this state will be complete for
GUIs
Fixed the conflict issues of PR#38
Merge pull request #39 from GSP362DeVryNov2014/jajav33-master

The branch used for fixing the conflicts in PR#38 by Javier