#34 provide the intellij profile in the groovy maven project template
Merge remote-tracking branch 'origin/master'

Conflicts:
	ngrinder-controller/src/main/resources/script_template/groovy_maven/pom.xml