merged users
merge
fixed categories; user can shop products by category, but without pics
Merge pull request #36 from lizrush/layout

Layout