Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop

Conflicts:
	web/app/views/users/_user_dropdown.html.erb

web/app/assets/javascripts/wizard/gear/gear_wizard.js

@@ -206,9 +206,7 @@
       $dialog = $('#gear-wizard-dialog');
       $wizardSteps = $dialog.find('.wizard-step');
       $templateSteps = $('#template-ftuesteps');
-      console.log("foo")
       var videoGear = $wizardSteps.filter($('.video-gear'))
-      console.log("fooBAR")
       wizard = new context.JK.Wizard(app);
 
       stepUnderstandGear.initialize($wizardSteps.filter($('[layout-wizard-step=0]')), self);
@@ -219,7 +217,6 @@
       stepNetworkTest.initialize($wizardSteps.filter($('.network-test')), self);
       stepSuccess.initialize($wizardSteps.filter($('.success')), self);
       
-      console.log("videoGear", videoGear)
       if(videoGear.length) {
         stepVideoGear.initialize(videoGear, self);
         STEPS[5]=stepVideoGear

web/app/views/clients/_session.html.slim

@@ -16,7 +16,7 @@
         = image_tag "content/icon_share.png", {:align => "texttop", :height => 12, :width => 12}
         |  SHARE 
 
-      - if (Rails.application.config.video_available && Rails.application.config.video_available!="none") || (current_user && current_user.admin)
+      - if (Rails.application.config.video_available && Rails.application.config.video_available!="none") 
         a#session-webcam.button-grey-toggle.video.left
           = image_tag "content/icon_cam.png", {:align => "texttop", :height => 12, :width => 12}
           |  VIDEO 

web/app/views/clients/wizard/gear/_gear_wizard.html.haml

@@ -158,7 +158,8 @@
                 %span.direct-monitoring-btn Play
 
     -step=4
-    -if (Rails.application.config.video_available && Rails.application.config.video_available!="none") || (current_user && current_user.admin)
+    -if (Rails.application.config.video_available && Rails.application.config.video_available!="none") 
+      %em=Rails.application.config.video_available
       .wizard-step.video-gear{ 'layout-wizard-step' => "#{step+=1}", 'dialog-title' =>  "Select Video Gear", 'dialog-purpose' => "SelectVideoGear" }
         .ftuesteps
         .clearall
@@ -214,7 +215,7 @@
     %a.ftue-stepnumber{'data-step-number' => 4} 5
     .ftue-step-title Turn Off Direct Monitoring
     -step = 4
-    -if (Rails.application.config.video_available && Rails.application.config.video_available!="none") || (current_user && current_user.admin)
+    -if (Rails.application.config.video_available && Rails.application.config.video_available!="none") 
       %a.ftue-stepnumber{'data-step-number' => step+=1}=step+1
       .ftue-step-title Select Video Gear
     %a.ftue-stepnumber{'data-step-number' => step+=1}=step+1

web/app/views/users/_user_dropdown.html.erb

@@ -15,7 +15,6 @@
 
   <div class="arrow-down"></div>
 
-
     <!-- user name -->
   <div id="user" class="user"></div>