Merge pull request #122 from robocup-junior/willplum/rule_reshuffle

Significant refactoring & re-ordering of the rules, no gameplay changes

Author: willplum