DEVIDM-131: Configuring the DS
Merge branch 'master' of github.com:stockholmuniversity/sukat-cxf-svc into DEVIDM-131
DEVIDM-131: indentation
DEVIDM-131: Removed duplicates
DEVIDM-131: Removed TODO
Merge branch 'master' of github.com:stockholmuniversity/sukat-cxf-svc into DEVIDM-131

Conflicts:
	src/main/webapp/WEB-INF/beans-groovy.xml
Merge pull request #81 from iceglow/DEVIDM-131

DEVIDM-131: bean xml fixes