Merge branch 'master' of github.com:blindsidenetworks/greenlight

Gemfile.lock

@@ -39,7 +39,6 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     arel (7.1.4)
-    bcrypt (3.1.11)
     bigbluebutton-api-ruby (1.6.0)
       xml-simple (~> 1.1)
     bootstrap-sass (3.3.0.0)
@@ -57,12 +56,6 @@ GEM
     coffee-script-source (1.10.0)
     concurrent-ruby (1.0.2)
     debug_inspector (0.0.2)
-    devise (4.2.0)
-      bcrypt (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 5.1)
-      responders
-      warden (~> 1.2.3)
     dotenv (2.1.1)
     dotenv-rails (2.1.1)
       dotenv (= 2.1.1)
@@ -135,7 +128,6 @@ GEM
     omniauth-twitter (1.2.1)
       json (~> 1.3)
       omniauth-oauth (~> 1.1)
-    orm_adapter (0.5.0)
     puma (3.6.0)
     rack (2.0.1)
     rack-test (0.6.3)
@@ -167,8 +159,6 @@ GEM
     rb-fsevent (0.9.7)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
-    responders (2.3.0)
-      railties (>= 4.2.0, < 5.1)
     sass (3.4.22)
     sass-rails (5.0.6)
       railties (>= 4.0.0, < 6)
@@ -199,8 +189,6 @@ GEM
       thread_safe (~> 0.1)
     uglifier (3.0.2)
       execjs (>= 0.3.0, < 3)
-    warden (1.2.6)
-      rack (>= 1.0)
     web-console (3.3.1)
       actionview (>= 5.0)
       activemodel (>= 5.0)
@@ -220,7 +208,6 @@ DEPENDENCIES
   bootstrap-social-rails (~> 4.12)
   byebug
   coffee-rails (~> 4.2)
-  devise (= 4.2.0)
   dotenv-rails
   jbuilder (~> 2.5)
   jquery-datatables-rails (~> 3.4.0)