updated
updated
Merge branch 'master' of https://github.com/ramesesinc/projects

Conflicts:
	web/ehoms/actions/getPatientPhoto
	web/ehoms/files/home_action/vitalsign.pg
Merge branch 'master' of https://github.com/ramesesinc/projects
updated the start launcher
updated the web: ehoms
Merge branch 'master' of https://github.com/ramesesinc/projects