Update BetterFooter branch with the master