Includes the new 'Draw' button in the disable/enable button functions.
Merge branch 'develop' into gh-pages