Allow buttons to have "disabled" state
Merge branch 'button_disabled' into development