Merge branch 'refs/heads/master' into binding

Conflicts:
	node_modules/montage/ui/application.js

Signed-off-by: Armen Kesablyan <armen@motorola.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/node_modules/montage/ui/bluemoon/textfield.reel/textfield.js b/node_modules/montage/ui/bluemoon/textfield.reel/textfield.js
index 6de3d636..eb8e482f 100644
--- a/node_modules/montage/ui/bluemoon/textfield.reel/textfield.js
+++ b/node_modules/montage/ui/bluemoon/textfield.reel/textfield.js
@@ -4,17 +4,17 @@
  (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
  </copyright> */
 /**
-        @module "montage/ui/bluemoon/textfield.reel"
+        @module "montage/ui/bluemoon/input-text.reel"
     @requires montage/core/core
     @requires montage/ui/editable-text
 */
 var Montage = require("montage").Montage,
     EditableText = require("ui/editable-text").EditableText;
 /**
-    @class module:"montage/ui/bluemoon/textfield.reel".Textfield
+    @class module:"montage/ui/bluemoon/input-text.reel".Textfield
     @extends module:montage/ui/editable-text.EditableText
 */
-var Textfield = exports.Textfield = Montage.create(EditableText,/** @lends module:"montage/ui/bluemoon/textfield.reel".Textfield# */ {
+var Textfield = exports.Textfield = Montage.create(EditableText,/** @lends module:"montage/ui/bluemoon/input-text.reel".Textfield# */ {
 /**
         Description TODO
         @type {Property}