Merge remote-tracking branch 'origin/master'

Conflicts:
	appointment.html
	css/styles.css
	index.html
	instantmessage.html
	js/commonForAll.js
	js/instantmessage.js
	patient.html
	search.html