init
Merge branch 'master' of https://github.com/DieMyst/grails-spring-rest-test

Conflicts:
	.gitignore
init