Merge branch 'HEAD' of https://github.com/dzamurovic/GroovyTests

Conflicts:
	src/test/groovy/my/test/example/MyTestSuite.groovy
	src/test/resources/my/test/example/test.xml