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

Conflicts:
	application/views/box_patient_list.php
search unfinished
procedure summary
gallery page revision
Merge remote-tracking branch 'origin/mic_branch' into development

Conflicts:
	application/views/scheduler.php