add search box
Merge branch 'master' of github.com:ProjectShepherd/shepherd-web

Conflicts:
	coffee/app.coffee