Search fixed. Customer search added. Currently customer search is on two attribs.
Merge branch 'master' of https://github.com/simpletaskjacob/castel_website

Conflicts:
	app/design/frontend/castel/default/template/catalogsearch/result.phtml