Merge branch 'development' of https://github.com/medixph/medix-dental into development

Conflicts:
	js/appointments.js
sample commit
consent mpdf

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