Merge pull request #126 from Codes-With-Eagles-SWE2014/ecgprc_final_sprint

integrated cities into event hierachy
Different types/colors of troops for each player. Can finally distinguish player's troops now
Removed unneeded resources.
Merge pull request #128 from Codes-With-Eagles-SWE2014/jrlmwc_sprint4

Jrlmwc sprint4
Merge pull request #129 from Codes-With-Eagles-SWE2014/ecgprc_final_sprint

bug fix in states
Merge pull request #130 from Codes-With-Eagles-SWE2014/ecgprc_final_sprint

additional bug fix, default values for city resources