Removing jbuilder
Merge branch 'master' into scaffolds