Merge branch 'pentool' into brushtool

Conflicts:
	imports/codemirror/mode/scheme/scheme.js
	js/tools/BrushTool.js

3 files changed, 1 insertions, 1 deletions

diff --git a/js/components/button.reel/button.css b/js/components/button.reel/button.css
index f50a9873..f50a9873 100644..100755
--- a/js/components/button.reel/button.css
+++ b/js/components/button.reel/button.css
diff --git a/js/components/button.reel/button.html b/js/components/button.reel/button.html
index d0398a6a..d0398a6a 100644..100755
--- a/js/components/button.reel/button.html
+++ b/js/components/button.reel/button.html
diff --git a/js/components/button.reel/button.js b/js/components/button.reel/button.js
index ce5ac1af..2d26c8b4 100644..100755
--- a/js/components/button.reel/button.js
+++ b/js/components/button.reel/button.js
@@ -179,7 +179,7 @@ var Button = exports.Button = Montage.create(Component, {
         value: function() {
             if(this.isToggleButton)
             {
-                if(this._value)
+                if(this._value === true)
                 {
                     this.element.classList.remove(this.offState);
                     this.element.classList.add(this.onState);