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