Merge remote-tracking branch 'ninja-internal/master' into test-merge

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js

2 files changed, 2 insertions, 2 deletions

diff --git a/js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.css b/js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.css
index 4db0abff..3ffcd2f5 100755
--- a/js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.css
+++ b/js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.css
@@ -56,7 +56,7 @@
 
 /* line 62, colorpanelpopup.scss */
 .cp_pu_palettes {
-  background: #000;
+  background: url(../img/icon_palette.jpg) no-repeat black -1px -1px;
 }
 
 /* line 67, colorpanelpopup.scss */
diff --git a/js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.scss b/js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.scss
index 1f63658a..cd9f47a2 100755
--- a/js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.scss
+++ b/js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.scss
@@ -60,7 +60,7 @@ $grey_light: #494949;
 
 .cp_pu_palettes
 {
-        background: #000;
+        background: url(../img/icon_palette.jpg) no-repeat #000 -1px -1px;
 }
 
 .cp_pu_nocolor