Switched from assembly plugin to a combination of dependency and war plugins, since assembly:assembly is deprecated.
New server version.
Merge branch 'master' of github.com:stockholmuniversity/sukat-cxf-svc

Conflicts:
	pom.xml
Merge pull request #45 from iceglow/cleanup

Switched from assembly plugin to a combination of dependency and war plugins