Fixed the Groovy star import settings in the default IDEA project file
Replaced star imports with individual import statements in Groovy sources
Merge branch 'master' into jdk7