text on bars added
button update
Merge branch 'Dev' into button_graphics