master: committing last changes to the application. Attempt to get standalone deployment working.
master:
Merge branch 'master' of github.com:melexis/esbmon

Conflicts:
	grails-app/conf/DataSource.groovy
master:
master: