alertAppointmts fixes
Merge branch 'master' of https://github.com/EnergyButterfly/OpenMed

Conflicts:
	dashboard.html