Merge branch 'master' into pentool

Conflicts:
	js/tools/PenTool.js

3 files changed, 18 insertions, 4 deletions

diff --git a/js/data/panels-data.js b/js/data/panels-data.js
index 7a2d817a..f613a3be 100644
--- a/js/data/panels-data.js
+++ b/js/data/panels-data.js
@@ -93,6 +93,18 @@ exports.PanelsData = Montage.create(Montage, {
             open: true,
             modulePath: "js/panels/presets/content.reel",
             moduleName: "content"
+        },
+        {
+            name: "History",
+            minHeight: 100,
+            height: 100,
+            maxHeight: null,
+            flexible: true,
+            collapsed: true,
+            scrollable: true,
+            open: true,
+            modulePath: "js/panels/history-panel/history.reel",
+            moduleName: "History"
         }
     ]
     }
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index 7edc90d8..157c54ec 100755
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -131,6 +131,8 @@ exports.PiData = Montage.create( Montage, {
                             type : "hottext",
                             id : "borderWidth",
                             prop : "border-width",
+                            defaultValue: 0,
+                            valueMutator: parseFloat,
                             label : "Border",
                             min :   0,
                             max :   100,
@@ -578,7 +580,7 @@ exports.PiData = Montage.create( Montage, {
                             valueMutator: parseFloat,
                             value : 0,
                             min :   0,
-                            max :   100,
+                            max :   99,
                             unit : "%",
                             acceptableUnits: ["%"]
 
diff --git a/js/data/tools-data.js b/js/data/tools-data.js
index faf3336f..4d009530 100755
--- a/js/data/tools-data.js
+++ b/js/data/tools-data.js
@@ -151,7 +151,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "properties":   "fillProperties",
                 "spriteSheet":  true,
                 "action":       "FillTool",
-                "toolTip":      "Fill Tool",
+                "toolTip":      "Paint Bucket Tool (K)",
                 "cursor":       "url('images/tools/bucket_down.png'), default",
                 "lastInGroup":  false,
                 "container":    false,
@@ -162,7 +162,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "properties":   "inkbottleProperties",
                 "spriteSheet":  true,
                 "action":       "InkBottleTool",
-                "toolTip":      "Ink Bottle Tool",
+                "toolTip":      "Ink Bottle Tool (K)",
                 "cursor":       "url('images/tools/inkbottle_down.png'), default",
                 "lastInGroup":  true,
                 "container":    false,
@@ -173,7 +173,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "properties":   "eyedropperProperties",
                 "spriteSheet":  true,
                 "action":       "EyedropperTool",
-                "toolTip":      "Eyedropper Tool",
+                "toolTip":      "Eyedropper Tool (I)",
                 "cursor":       "url('images/tools/eyedropper_down.png') 6 20, default",
                 "lastInGroup":  false,
                 "container":    false,