Updated master after merge conflicts

Change-Id: Ibea933c20071cc85201420ba1e31fedf9356f55b
Signed-off-by: Iftekharul Islam <iffy.ryan@ibm.com>
diff --git a/app/common/directives/log-event.js b/app/common/directives/log-event.js
index ae4970d..51bb5dd 100644
--- a/app/common/directives/log-event.js
+++ b/app/common/directives/log-event.js
@@ -9,7 +9,8 @@
                 'templateUrl': 'common/directives/log-event.html',
                 'scope': {
                    'event': '=',
-                   'tmz': '='
+                   'tmz': '=',
+                   'multiSelected': '='
                 },
                 'controller': ['$rootScope', '$scope','dataService', '$location', '$timeout', function($rootScope, $scope, dataService, $location, $timeout){
                     $scope.dataService = dataService;