added search for patients
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/patients.html
merged patient search