changes to search form
update
Merge branch 'master' of https://github.com/StephenGrider/CCare

Conflicts:
	config/routes.js
	public/javascripts/app.js