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

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