Bb upgrade

MIgrating from bb 1.0 to 1.1.0 and bb-pagebale from our fork to 1.3.2