44 - importer maven config
Merge branch 'develop' of github.com:SolidStateGroup/patientview into develop
Introduction of saving observations

Merge branch 'security-aspect-fix' of github.com:SolidStateGroup/patientview into 44-xml-importer

Conflicts:
	root/api/src/main/java/org/patientview/api/controller/UserController.java
	root/api/src/main/java/org/patientview/api/service/SecurityService.java
	root/api/src/test/java/org/patientview/api/aspect/SecurityAspectTest.java
Introduction of saving observations

Merge branch 'security-aspect-fix' of github.com:SolidStateGroup/patientview into 44-xml-importer

Conflicts:
	root/api/src/main/java/org/patientview/api/controller/UserController.java
	root/api/src/main/java/org/patientview/api/service/SecurityService.java
	root/api/src/test/java/org/patientview/api/aspect/SecurityAspectTest.java
Merge pull request #79 from SolidStateGroup/44-xml-importer

44 xml importer