update deps
Merge branch 'master' into gridable
update to backgrid 2.5