-added Season enum and more work on spock tests
Merge branch 'develop' of https://github.com/objectpartners/cloaked-archer into develop