Merge branch 'montage-integration' of github.com:Motorola-Mobility/ninja-internal into integration

Conflicts:
	js/io/system/ninjalibrary.json

1 files changed, 1 insertions, 1 deletions

diff --git a/js/components/tools-properties/text-properties.reel/text-properties.html b/js/components/tools-properties/text-properties.reel/text-properties.html
index 13a88ba7..2d50a79e 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.html
+++ b/js/components/tools-properties/text-properties.reel/text-properties.html
@@ -69,7 +69,7 @@
 
             },
             "fontSettings": {
-                "module": "js/components/button.reel",
+                "module": "montage/ui/button.reel",
                 "name": "Button",
                 "properties": {
                     "element": {"#": "fontSettings"}