Added new toolbar, support library v7, sugar ORM