Merge toolbox.js into fein_tree.js
Merge branch 'next' of github.com:feincms/feincms into next