Search Retailer Page Design
Merge branch 'master' of github.com:fashioncache/fashioncache

Conflicts:
	signup_or_login.php