Merge branch 'refs/heads/NinjaInternal' into Color

Conflicts:
	js/controllers/elements/shapes-controller.js
	js/data/pi/pi-data.js
	js/panels/properties/content.reel/content.js

1 files changed, 22 insertions, 0 deletions

diff --git a/js/components/treeview/branch.reel/branch.css b/js/components/treeview/branch.reel/branch.css
new file mode 100644
index 00000000..0f4e4a87
--- /dev/null
+++ b/js/components/treeview/branch.reel/branch.css
@@ -0,0 +1,22 @@
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
+
+.treeRoot > .branch > ul {
+    margin-top: 0;
+}
+.branch > .branch-label {
+    font-weight: bold;
+    cursor: pointer;
+}
+.branch ul {
+    list-style: none;
+}
+.branch ul {
+    padding-left: 30px;
+}
+.branch .collapse {
+    display: none;
+}
\ No newline at end of file