Updated with initialization services.
Refactoring.
Merge branch 'master' of https://github.com/Annotopia/Annotopia

Conflicts:
	grails-app/conf/BootStrap.groovy