Merge remote-tracking branch 'origin/development' into mic_branch

Conflicts:
	js/appointments.js
receptionist finish
Merge remote-tracking branch 'origin/development' into mic_branch