Adding new spockframework reporting functionality
Merging changes