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/checkbox.reel/checkbox.js b/node_modules/montage/ui/bluemoon/checkbox.reel/checkbox.js
index 58e5154d..eec8a476 100644
--- a/node_modules/montage/ui/bluemoon/checkbox.reel/checkbox.js
+++ b/node_modules/montage/ui/bluemoon/checkbox.reel/checkbox.js
@@ -4,17 +4,17 @@
  (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
  </copyright> */
 /**
-        @module "montage/ui/bluemoon/checkbox.reel"
+        @module "montage/ui/bluemoon/input-checkbox.reel"
     @requires montage/core/core
     @requires montage/ui/component
 */
 var Montage = require("montage").Montage,
     Component = require("ui/component").Component;
 /**
-    @class module:"montage/ui/bluemoon/checkbox.reel".Checkbox
+    @class module:"montage/ui/bluemoon/input-checkbox.reel".Checkbox
     @extends module:montage/ui/component.Component
 */
-exports.Checkbox = Montage.create(Component,/** @lends "module:montage/ui/bluemoon/checkbox.reel".Checkbox# */ {
+exports.Checkbox = Montage.create(Component,/** @lends "module:montage/ui/bluemoon/input-checkbox.reel".Checkbox# */ {
     // Configuration
     /**
         The distance (squared) beyond which a touch will be considered.