Drop unnecessary rescue statements
drop duplicated code on add / update order
lock jbuilder on older version

otherwise we need to verify and double check each hackage done by active
support (apparently new jbuilder doens't load activesupport anymore)
Merge branch 'master' into cassetes