adapted server to missing User.Builder generateForOutput method
adapted code for new Meta.Builder constructor and missing setLocation
method in Meta object
Merge branch 'OSNG-265' of github.com:davidmoebius/server into HEAD
[cleanup] removed unused method
[fix] moved password removal of SCIM user to provisioning layer
Merge remote-tracking branch 'remotes/origin/develop' into wibesa

Conflicts:
	resource-server/src/main/java/org/osiam/resources/provisioning/SCIMUserProvisioningBean.java
Merge remote-tracking branch 'remotes/origin/develop' into wibesa

Conflicts:
	src/test/resources/database_seed.xml