Merge branch 'master' into gh-pages
Fix
Merge
Button Color
Button styling
Button disabled
modified box spacing