Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal

Conflicts:
	css/ninja.css
	js/stage/stage.reel/stage.html
	js/tools/TextTool.js
	node_modules/labs/rich-text-editor.reel/rich-text-editor.css
	node_modules/labs/rich-text-editor.reel/rich-text-editor.html
	node_modules/labs/rich-text-editor.reel/rich-text-editor.js
	node_modules/labs/rich-text-editor.reel/rich-text-resizer.js
	node_modules/labs/rich-text-editor.reel/rich-text-sanitizer.js

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

10 files changed, 0 insertions, 0 deletions

diff --git a/js/panels/Timeline/Layer.reel/images/eye.png b/js/panels/Timeline/Layer.reel/images/eye.png
new file mode 100644
index 00000000..8ec1759e
--- /dev/null
+++ b/js/panels/Timeline/Layer.reel/images/eye.png
diff --git a/js/panels/Timeline/Layer.reel/images/icon-collapsed.png b/js/panels/Timeline/Layer.reel/images/icon-collapsed.png
new file mode 100644
index 00000000..d2823a89
--- /dev/null
+++ b/js/panels/Timeline/Layer.reel/images/icon-collapsed.png
diff --git a/js/panels/Timeline/Layer.reel/images/icon-eye.png b/js/panels/Timeline/Layer.reel/images/icon-eye.png
new file mode 100644
index 00000000..6178654e
--- /dev/null
+++ b/js/panels/Timeline/Layer.reel/images/icon-eye.png
diff --git a/js/panels/Timeline/Layer.reel/images/icon-lock.png b/js/panels/Timeline/Layer.reel/images/icon-lock.png
new file mode 100644
index 00000000..e06b4f22
--- /dev/null
+++ b/js/panels/Timeline/Layer.reel/images/icon-lock.png
diff --git a/js/panels/Timeline/Layer.reel/images/icon-minus.png b/js/panels/Timeline/Layer.reel/images/icon-minus.png
new file mode 100644
index 00000000..20a047f5
--- /dev/null
+++ b/js/panels/Timeline/Layer.reel/images/icon-minus.png
diff --git a/js/panels/Timeline/Layer.reel/images/icon-open.png b/js/panels/Timeline/Layer.reel/images/icon-open.png
new file mode 100644
index 00000000..8dc14271
--- /dev/null
+++ b/js/panels/Timeline/Layer.reel/images/icon-open.png
diff --git a/js/panels/Timeline/Layer.reel/images/icon-plus.png b/js/panels/Timeline/Layer.reel/images/icon-plus.png
new file mode 100644
index 00000000..ad1381b9
--- /dev/null
+++ b/js/panels/Timeline/Layer.reel/images/icon-plus.png
diff --git a/js/panels/Timeline/Layer.reel/images/lock_closed.png b/js/panels/Timeline/Layer.reel/images/lock_closed.png
new file mode 100644
index 00000000..8ff213b7
--- /dev/null
+++ b/js/panels/Timeline/Layer.reel/images/lock_closed.png
diff --git a/js/panels/Timeline/Layer.reel/images/lock_open.png b/js/panels/Timeline/Layer.reel/images/lock_open.png
new file mode 100644
index 00000000..9db30f8d
--- /dev/null
+++ b/js/panels/Timeline/Layer.reel/images/lock_open.png
diff --git a/js/panels/Timeline/Layer.reel/images/panelDisclosureIcon.png b/js/panels/Timeline/Layer.reel/images/panelDisclosureIcon.png
new file mode 100644
index 00000000..4db78f13
--- /dev/null
+++ b/js/panels/Timeline/Layer.reel/images/panelDisclosureIcon.png