search working for locations and groups
Merge branch 'nathan-dev' into richmond-dev
merging to get in latest quest updates
finshed database calls for sitewide search
Merge branch 'richmond-dev' into nathan-dev

Conflicts:
	app/views/shared/template.jade
	app/views/users/checkIn.jade