Merge branch 'refs/heads/NINJAmaster' into TimelineUber

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

Signed-off-by: Jonathan Duran <jduran@motorola.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/js/components/layout/subtool-button.reel/subtool-button.css b/js/components/layout/subtool-button.reel/subtool-button.css
index cda505b0..b98941d9 100755
--- a/js/components/layout/subtool-button.reel/subtool-button.css
+++ b/js/components/layout/subtool-button.reel/subtool-button.css
@@ -12,11 +12,11 @@
     background: #B2B2B2;
 }
 
-#toolBarButton {
+.toolBarButton {
     border: 3px;
     float: left;
 }
 
-#toolBarButton:hover {
+.toolBarButton:hover {
     opacity: 1;
 }