Merge branch 'refs/heads/master' into dom-architecture

Conflicts:
	js/document/templates/montage-html/package.json
	js/io/system/ninjalibrary.json
	node_modules/descriptor.json

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/js/tools/InkBottleTool.js b/js/tools/InkBottleTool.js
index fd17f4d6..2c03d133 100755
--- a/js/tools/InkBottleTool.js
+++ b/js/tools/InkBottleTool.js
@@ -69,7 +69,7 @@ exports.InkBottleTool = Montage.create(ModifierToolBase, {
 
             if(this._canColor && this.application.ninja.selectedElements.length)
             {
-                var color = this.application.ninja.colorController.colorToolbar.stroke,
+                var color = this.options.stroke,
                     colorInfo;
                 if(color && color.color)
                 {