Bugfixes, Upload Improve and archive #25 #17
Merge branch 'robin'

Conflicts:
	js/patient.js