Fix migrate problem caused by output formating(?)
Merge branch 'master' of http://github.com/foodcoops/foodsoft
Revert "Fix migrate problem caused by output formating(?)"

This reverts commit 53f24cd885169d4bb0adf2253257fdaabc3dd054.
Add article price tooltip to StockTaking form
Move StockArticle#history to StockArticle#show
Complete StockArticle#show view
Merge branch 'master' of http://github.com/foodcoops/foodsoft into article-price-tooltip
Prepare tooltip for next bootstrap version (as in 1fed9834b35dbee8b329305b2a62ac1ddf8e0eb7)
Add some locales for article attributes
Merge pull request #184 from foodcoop-rostock/article-price-tooltip

Show StockArticle price details to user