add show_user/merchant page
delete unnecessary space
fix merge conflicts in orders_controller
limit number of orderitems quantity to the numbers of products in stock
add browse by merchants area on front page
changed some naming for better browsing xp
add out_of_stock? helper method
refine 'out of stock' notices
Merge branch 'master' into products