tune conversation
work on merchant and user page
add location
improving beverage creation
improving beverage creation
add activity_feeds
add cocktail
improve article
add complain
implement Search
add grape
add grape
improve beverage index page
improve beverage form
improve display of beverage
add rating