Merge branch 'develop'

Author: toastercup

Gemfile.lock

@@ -21,17 +21,6 @@ GIT
     rails-observers (0.1.3.alpha)
       activemodel (>= 4.0, < 5.1)
 
-PATH
-  remote: ../cortex-plugins-core
-  specs:
-    cortex-plugins-core (0.7.2)
-      cells (~> 4.1)
-      cells-haml (~> 0.0.10)
-      cells-rails (~> 0.0.6)
-      jsonb_accessor (~> 1.0.0.beta)
-      mimemagic (~> 0.3.2)
-      rails (>= 4)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -147,6 +136,13 @@ GEM
     concurrent-ruby (1.0.4)
     connection_pool (2.2.1)
     cortex-exceptions (0.0.4)
+    cortex-plugins-core (0.8.0)
+      cells (~> 4.1)
+      cells-haml (~> 0.0.10)
+      cells-rails (~> 0.0.6)
+      jsonb_accessor (~> 1.0.0.beta)
+      mimemagic (~> 0.3.2)
+      rails (>= 4)
     database_cleaner (1.5.3)
     debug_inspector (0.0.2)
     descendants_tracker (0.0.4)
@@ -706,7 +702,7 @@ DEPENDENCIES
   cells-rails (~> 0.0.6)
   codeclimate-test-reporter (~> 0.6)
   cortex-exceptions (= 0.0.4)
-  cortex-plugins-core!
+  cortex-plugins-core (= 0.8.0)
   database_cleaner (~> 1.5)
   devise (~> 4.2.0)
   doorkeeper (~> 4.2)