changing project's configuration
Merge branch 'master' of https://github.com/jmguilla/grails_template

Conflicts:
	.gitignore