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
Merge branch 'master' into updated-gems

Conflicts:
	Gemfile.lock
update gems
bundle update
start moving from simple_form i18n to activerecord
add missing i18n
use i18n-js
i18n ordering javascript
Force update in Order#finish; rescue if error raised
Merge branch 'master' into updated-gems

Conflicts:
	Gemfile
	Gemfile.lock