Add eclipse and grails project files
Fixed conflict