* Refactored Ruleset to add OfficialRuleset.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/scala/sa/ai/rule/ShortestGameScenario.scala
* Merge