Card #275 UAT: use group short name for information provided by: checkboxes
Card #275 UAT: staff filter order
Card #275 UAT: order contact points in contact by type alphabetically, hide empty additional location details
Card #275 UAT: join request link
Card #213: don't redirect using $location after password change (causes routing issues)
Merge branch 'develop' of github.com:SolidStateGroup/patientview into milestone-6

Conflicts:
	root/webapp/app/views/contact.html