JSONAPI stuff

Gemfile.lock

@@ -38,15 +38,6 @@ GIT
       couch_potato (>= 0.2.15)
       rest-client (>= 1.4.2)
 
-GIT
-  remote: git://github.com/rails-api/active_model_serializers.git
-  revision: 6784866a2d4a57e5b1c571afcbf76362708b11ab
-  specs:
-    active_model_serializers (0.10.0.rc2)
-      actionpack (>= 4.0)
-      activemodel (>= 4.0)
-      railties (>= 4.0)
-
 PATH
   remote: /home/benjamin/development/rails/components/jsonapi-serializers
   specs:
@@ -83,6 +74,8 @@ GEM
       activemodel (>= 3.0.2, < 5.0)
       activesupport (>= 3.0.2, < 5.0)
     active_decorator (0.5.3)
+    active_model_serializers (0.9.3)
+      activemodel (>= 3.2)
     activejob (4.2.4)
       activesupport (= 4.2.4)
       globalid (>= 0.3.0)
@@ -390,12 +383,12 @@ GEM
     rubyzip (1.1.7)
     safe_yaml (1.0.4)
     sass (3.4.18)
-    sass-rails (5.0.3)
+    sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
-      tilt (~> 1.1)
+      tilt (>= 1.1, < 3)
     selenium-webdriver (2.47.1)
       childprocess (~> 0.5)
       multi_json (~> 1.0)
@@ -439,7 +432,7 @@ GEM
       ref
     thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (1.4.1)
+    tilt (2.0.1)
     timers (4.0.4)
       hitimes
     tinymce-rails (4.2.4)
@@ -479,7 +472,7 @@ DEPENDENCIES
   ace-rails-ap
   active_attr
   active_decorator
-  active_model_serializers!
+  active_model_serializers (= 0.9.3)
   airbrussh
   bourbon
   cancancan