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 #85 from iceglow/DEVIDM-94

DEVIDM-94: Changed default authorizor to spocp
[maven-release-plugin] prepare release 1.3.0rc12
[maven-release-plugin] prepare for next development iteration
Upgraded to latest cxf-server
Merge pull request #86 from iceglow/cleanup

Upgraded to latest cxf-server
Merge pull request #81 from iceglow/DEVIDM-131

DEVIDM-131: bean xml fixes
New server version
Merge pull request #87 from iceglow/cleanup

New server version
New server version
Merge pull request #88 from iceglow/cleanup

New server version
[maven-release-plugin] prepare release 1.3.0rc13
[maven-release-plugin] prepare for next development iteration
Removed prepared statement conf.
Upgrading to latest cxf-server version