Ongoing work: APIGW-599
Moved all encryption/decryption of the id:s to boarder of the components. So an id is encrypted when it's leaving a component and decrypted when it's entring a component. Within a componenet it's always in a decrypted format.
Merge encryption changes
Merge local-dev branch and master, step 1
Make master run on local environment
Merge branch 'master2'

Conflicts:
	apigw/auth-server/auth-server-web/src/main/webapp/WEB-INF/web.xml
Add local dev properties