Merge branch 'develop' of github.com:SolidStateGroup/patientview into develop-ui

Conflicts:
	root/webapp/app/views/groups.html
	root/webapp/app/views/partials/groupDetails.html
	root/webapp/app/views/partials/menus.html
	root/webapp/app/views/partials/staffDetails.html
	root/webapp/app/views/staff.html