change user login manner and back origin file
add product in mbox edit page
fix bug: merchant_info change_info routes error
products show page
products index page without hot
Merge branch 'merchant_product'

Conflicts:
	app/assets/stylesheets/wifi.css
	config/routes.rb