search functionality completed
Merge branch 'master' of heroku.com:webo-pix

Conflicts:
	app/views/dashboards/show.html.erb