Card #168 - refactor
Merge branch 'develop' into 168-messaging

Conflicts:
	root/api/src/main/java/org/patientview/api/service/impl/ConversationServiceImpl.java
Card #168 - avoid jackson & lazy loading issue (handler object and trying to serialize proxy) by setting @JsonIgnoreProperties({"hibernateLazyInitializer", "handler"}) on User.java
Card #168 - dates, info message
Card #168 - unread conversation count, needs CSS
Card #168 - html help on view messages and quick reply
Card #168 - refactor service, ui, fix for unread messages logic
removed verify in testExecuteDaily
Merge pull request #49 from SolidStateGroup/168-messaging

168 messaging
Card #104 - last update/updater on news edit
Card #146 - disable dummy patient checkbox on edit
Card #146 - correct treatment/last login column
Card #146 - correct ordering of groups, parse html and order groups moved to rootscope (should be in util?)
Card #146 - only allow creation of patient with at least one identifier
Card #146 - fix for delete from other groups (added ignore specialties)
Card #146 - only global/specialty/unitadmin can see delete in menu
Merge pull request #50 from SolidStateGroup/104-news

Card #104 - last update/updater on news edit
Merge pull request #51 from SolidStateGroup/146-patients

146 patients
Merge remote-tracking branch 'remotes/origin/develop' into 127-join-requests

Conflicts:
	root/api/src/test/java/org/patientview/api/job/StatisticsTaskTest.java