Merge branch 'refs/heads/FileIO-jose' into FileIO

Conflicts:
	js/document/html-document.js
	js/helper-classes/3D/snap-manager.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/js/panels/properties/content.reel/content.js b/js/panels/properties/content.reel/content.js
index 53926c78..9b6416c7 100755
--- a/js/panels/properties/content.reel/content.js
+++ b/js/panels/properties/content.reel/content.js
@@ -163,7 +163,7 @@ exports.Content = Montage.create(Component, {
             // For now hardcode the background since it is the only custom property
             // No need to loop through all the properties.
             var backgroundChip = this.customSections[0].content.controls["background"];
-            backgroundChip.initialColor = ElementsMediator.getProperty(stage, "background");
+            backgroundChip.color = ElementsMediator.getProperty(stage, "background");
 
             /*
             var customPI = PiData[this.customPi];