user success login page
add product hot feature to products index page
change products show page unser wifi namespace
Merge branch 'merchant_product'

Conflicts:
	app/assets/stylesheets/wifi.css