run bundle update and make it work again
proper usage of jQuery.on(), and update javascript in views as well
bundle update
use less-rails, and make exception_notifier work again
update uglifier
Merge branch 'master' into updated-gems
client_side_validations config
Merge branch 'master' into updated-gems

Conflicts:
	Gemfile.lock
	app/views/deliveries/_form.html.haml
update bootstrap assets
fix tooltip after bootstrap update
Merge branch 'master' into updated-gems

Conflicts:
	Gemfile.lock
Added hint when changing total delivered amount.
Merge branch 'master' into updated-gems

Conflicts:
	Gemfile.lock
update gems
Add list.js for filtering articles (another try for foodcoops#143)
Add delay to list.js search
Always show article category headers (do not unlist them on list.js search)
Add dismiss button to sidebars in group_order form (idea stolen from foodcoops#143)
Merge pull request #175 from foodcoop-rostock/fix-balancing

Added hint when changing total delivered amount.
Add button to clear article search (list.js customization)