Updated groovy compiler in parent pom
Merge remote-tracking branch 'origin/master'