dummy
Merge master
Merge branch 'master' into local-dev
Merge branch 'master' into local-dev
Merge branch 'master' into local-dev
Updated dependencies
Merge from master
Merge commit 'ed4141d686f39ecf55d30aea917b907f9d7d7e92' into local-dev
use saml login to mvk
Merge remote-tracking branch 'origin/master' into local-dev
updated version of dependency
Merge branch 'master' into local-dev
correct dependency
updated dependencies
updated local properties with new hostname
Adding more mock document for CareContacts.
Adding missing documentId to mock data
Adding missing documentId to mock data
Merge branch 'local-dev' of https://code.google.com/p/apigw into local-dev

Conflicts:
	apigw/resource-server/clinicalprocess-logistics-logistics/mock-producer/src/main/java/se/riv/clinicalprocess/logistics/logistics/getcarecontact/GetCareContactProducerImpl.java
Fix bug: java.lang.IllegalArgumentException: URI is not absolute