updating to fix multiple grails bugs
Merge branch 'master' of github.com:orubel/api-example-2.0

Conflicts:
	grails-app/conf/DataSource.groovy
	grails-app/controllers/net/nosegrind/TestController.groovy