Merge branch 'master' into rails4

Author: elia

lib/active_admin/mongoid/document.rb

@@ -15,7 +15,7 @@ def type
       when Moped::BSON::ObjectId, Object
         :string
       else
-        p _super.name.underscore.to_sym
+        _super.name.underscore.to_sym
       end
     end
   end