Password change at login
Password change at login
Merge pull request #37 from SolidStateGroup/168-messaging

168 messaging
121 - added the changePassword flag to be reset when logging in
Merge branch 'develop' of github.com:SolidStateGroup/patientview into 121-locked-login

Conflicts:
	root/webapp/app/index.html
Merge pull request #40 from SolidStateGroup/121-locked-login

121 locked login
Merge pull request #41 from SolidStateGroup/168-messaging

168 messaging
fix for testFindConversationByUserPaging
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
Card #104 - Initial backend/frontend plus tests
Card #104 - add news, correct pagination
Card #104 - delete news, with confirmation
Card #104 - edit news, to be completed
Card #104 - edit news, inc add/remove groups and roles (note: not groupRoles)
Card #104 - simplified ternary, return ok on put add role/group
Card #104 - auth user in conversationservicetest
Card #104 - auth user in conversationservicetest checkstyle
Card #104 - show less/more on news text (directive), [needs a:hover pointer CSS]
Card #104 - show less/more on news text, cant use directive if we want html using ng-bind-html. added truncate filter (useful for text, but breaks html if truncate during html rather than text)