Merge branches 'develop' and 'milestone2' of github.com:SolidStateGroup/patientview into milestone2

Conflicts:
	root/webapp/dist/index.html
	root/webapp/dist/views/dashboard.html