Merge branch 'develop' of github.com:SolidStateGroup/patientview into 121-locked-login

Conflicts:
	root/webapp/app/index.html
Merge branch 'develop' of github.com:SolidStateGroup/patientview into 121-locked-login

Conflicts:
	root/webapp/app/index.html
Added more statistical functionality
Merge branch 'develop' of github.com:SolidStateGroup/patientview into 68-unit-statistics

Conflicts:
	root/data/src/main/java/org/patientview/persistence/model/NewsItem.java
	root/data/src/test/java/org/patientview/test/persistence/repository/NewsRepositoryTest.java
Unstashed changes

Conflicts:
	root/data/src/main/java/org/patientview/persistence/model/NewsItem.java
	root/data/src/test/java/org/patientview/test/persistence/repository/NewsRepositoryTest.java
Merge pull request #44 from SolidStateGroup/68-unit-statistics

68 unit statistics