Merge pull request #2 from coder2000/master

Merge master into develop

Gemfile.lock

@@ -155,11 +155,7 @@ GEM
     cucumber-wire (0.0.1)
     data-confirm-modal (1.5.0)
       railties (>= 3.0)
-    database_cleaner (1.6.1)
-    declarative (0.0.10)
-    declarative-option (0.1.0)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
+    database_cleaner (1.6.2)
     diff-lcs (1.3)
     docile (1.1.5)
     dragonfly (1.1.3)
@@ -208,7 +204,7 @@ GEM
     haml (5.0.4)
       temple (>= 0.8.0)
       tilt
-    i18n (0.9.0)
+    i18n (0.9.1)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     jbuilder (2.7.0)
@@ -291,7 +287,7 @@ GEM
     puma (3.10.0)
     pundit (1.1.0)
       activesupport (>= 3.0.0)
-    pundit-matchers (1.3.1)
+    pundit-matchers (1.4.1)
       pundit (~> 1.1, >= 1.1.0)
       rspec-rails (>= 3.0.0)
     rack (2.0.3)
@@ -386,7 +382,7 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    selenium-webdriver (3.6.0)
+    selenium-webdriver (3.7.0)
       childprocess (~> 0.5)
       rubyzip (~> 1.0)
     shoulda-matchers (3.1.2)
@@ -426,7 +422,7 @@ GEM
     turbolinks (5.0.1)
       turbolinks-source (~> 5)
     turbolinks-source (5.0.3)
-    tzinfo (1.2.3)
+    tzinfo (1.2.4)
       thread_safe (~> 0.1)
     uber (0.1.0)
     uglifier (3.2.0)