Merge branch 'eHealth-Yelp' of https://github.com/shasha-chen/eHealth_node into eHealth-Yelp

Conflicts:
	app/routes.js
	package.json
	views/patient_app_request.ejs