diff --git a/package-lock.json b/package-lock.json
index 86477c9a..95243416 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1938,13 +1938,76 @@
       }
     },
     "@ember/ordered-set": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@ember/ordered-set/-/ordered-set-2.0.0.tgz",
-      "integrity": "sha512-DeEINHAJ9JGyrjpRcRh7V7hsdmfmidQsFt4ZxcUywytXm48zPUNKJQ2f5PygjPcqg880PUwqYH2+1YXHtokLyA==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@ember/ordered-set/-/ordered-set-2.0.3.tgz",
+      "integrity": "sha512-F4yfVk6WMc4AUHxeZsC3CaKyTvO0qSZJy7WWHCFTlVDQw6vubn+FvnGdhzpN1F00EiXMI4Tv1tJdSquHcCnYrA==",
       "dev": true,
       "requires": {
-        "ember-cli-babel": "6.16.0",
-        "ember-compatibility-helpers": "1.0.2"
+        "ember-cli-babel": "6.17.2",
+        "ember-compatibility-helpers": "1.1.2"
+      },
+      "dependencies": {
+        "babel-plugin-debug-macros": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.2.0.tgz",
+          "integrity": "sha512-Wpmw4TbhR3Eq2t3W51eBAQSdKlr+uAyF0GI4GtPfMCD12Y4cIdpKC9l0RjNTH/P9isFypSqqewMPm7//fnZlNA==",
+          "dev": true,
+          "requires": {
+            "semver": "5.5.1"
+          }
+        },
+        "broccoli-funnel": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/broccoli-funnel/-/broccoli-funnel-2.0.1.tgz",
+          "integrity": "sha512-C8Lnp9TVsSSiZMGEF16C0dCiNg2oJqUKwuZ1K4kVC6qRPG/2Cj/rtB5kRCC9qEbwqhX71bDbfHROx0L3J7zXQg==",
+          "dev": true,
+          "requires": {
+            "array-equal": "1.0.0",
+            "blank-object": "1.0.2",
+            "broccoli-plugin": "1.3.0",
+            "debug": "2.6.9",
+            "fast-ordered-set": "1.0.3",
+            "fs-tree-diff": "0.5.7",
+            "heimdalljs": "0.2.5",
+            "minimatch": "3.0.4",
+            "mkdirp": "0.5.1",
+            "path-posix": "1.0.0",
+            "rimraf": "2.6.2",
+            "symlink-or-copy": "1.1.8",
+            "walk-sync": "0.3.2"
+          }
+        },
+        "ember-cli-babel": {
+          "version": "6.17.2",
+          "resolved": "https://registry.npmjs.org/ember-cli-babel/-/ember-cli-babel-6.17.2.tgz",
+          "integrity": "sha512-9KcCvF1PcelEFTSiJ/Ld20tfuW9acMkwHC/xINLsmwqJVDbm3oEqWtiFDZ5ebaC278O5I0GqNJWJLYNoWMNZ8g==",
+          "dev": true,
+          "requires": {
+            "amd-name-resolver": "1.2.0",
+            "babel-plugin-debug-macros": "0.2.0",
+            "babel-plugin-ember-modules-api-polyfill": "2.5.0",
+            "babel-plugin-transform-es2015-modules-amd": "6.24.1",
+            "babel-polyfill": "6.26.0",
+            "babel-preset-env": "1.7.0",
+            "broccoli-babel-transpiler": "6.5.0",
+            "broccoli-debug": "0.6.4",
+            "broccoli-funnel": "2.0.1",
+            "broccoli-source": "1.1.0",
+            "clone": "2.1.1",
+            "ember-cli-version-checker": "2.1.2",
+            "semver": "5.5.1"
+          }
+        },
+        "ember-cli-version-checker": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ember-cli-version-checker/-/ember-cli-version-checker-2.1.2.tgz",
+          "integrity": "sha512-sjkHGr4IGXnO3EUcY21380Xo9Qf6bC8HWH4D62bVnrQop/8uha5XgMQRoAflMCeH6suMrezQL287JUoYc2smEw==",
+          "dev": true,
+          "requires": {
+            "resolve": "1.5.0",
+            "semver": "5.5.1"
+          }
+        }
       }
     },
     "@ember/test-helpers": {
@@ -3312,6 +3375,56 @@
         }
       }
     },
+    "babel-preset-env": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.7.0.tgz",
+      "integrity": "sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg==",
+      "dev": true,
+      "requires": {
+        "babel-plugin-check-es2015-constants": "6.22.0",
+        "babel-plugin-syntax-trailing-function-commas": "6.22.0",
+        "babel-plugin-transform-async-to-generator": "6.24.1",
+        "babel-plugin-transform-es2015-arrow-functions": "6.22.0",
+        "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0",
+        "babel-plugin-transform-es2015-block-scoping": "6.26.0",
+        "babel-plugin-transform-es2015-classes": "6.24.1",
+        "babel-plugin-transform-es2015-computed-properties": "6.24.1",
+        "babel-plugin-transform-es2015-destructuring": "6.23.0",
+        "babel-plugin-transform-es2015-duplicate-keys": "6.24.1",
+        "babel-plugin-transform-es2015-for-of": "6.23.0",
+        "babel-plugin-transform-es2015-function-name": "6.24.1",
+        "babel-plugin-transform-es2015-literals": "6.22.0",
+        "babel-plugin-transform-es2015-modules-amd": "6.24.1",
+        "babel-plugin-transform-es2015-modules-commonjs": "6.26.0",
+        "babel-plugin-transform-es2015-modules-systemjs": "6.24.1",
+        "babel-plugin-transform-es2015-modules-umd": "6.24.1",
+        "babel-plugin-transform-es2015-object-super": "6.24.1",
+        "babel-plugin-transform-es2015-parameters": "6.24.1",
+        "babel-plugin-transform-es2015-shorthand-properties": "6.24.1",
+        "babel-plugin-transform-es2015-spread": "6.22.0",
+        "babel-plugin-transform-es2015-sticky-regex": "6.24.1",
+        "babel-plugin-transform-es2015-template-literals": "6.22.0",
+        "babel-plugin-transform-es2015-typeof-symbol": "6.23.0",
+        "babel-plugin-transform-es2015-unicode-regex": "6.24.1",
+        "babel-plugin-transform-exponentiation-operator": "6.24.1",
+        "babel-plugin-transform-regenerator": "6.26.0",
+        "browserslist": "3.2.8",
+        "invariant": "2.2.2",
+        "semver": "5.5.1"
+      },
+      "dependencies": {
+        "browserslist": {
+          "version": "3.2.8",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz",
+          "integrity": "sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==",
+          "dev": true,
+          "requires": {
+            "caniuse-lite": "1.0.30000888",
+            "electron-to-chromium": "1.3.72"
+          }
+        }
+      }
+    },
     "babel-register": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
@@ -6595,16 +6708,25 @@
       }
     },
     "ember-compatibility-helpers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/ember-compatibility-helpers/-/ember-compatibility-helpers-1.0.2.tgz",
-      "integrity": "sha512-pN1ezLiAM+uIKI4/BMp2hIBi6LQKxOedxKcu2mHDK+HEYuhlwki8Y2YwFSwb1w3c2YhesbkwaAJx/dvNHQGq5g==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/ember-compatibility-helpers/-/ember-compatibility-helpers-1.1.2.tgz",
+      "integrity": "sha512-yN163MzERpotO8M0b+q+kXs4i3Nx6aIriiZHWv+yXQzr2TAtYlVwg9V7/3+jcurOa3oDEYDpN7y9UZ6q3mnoTg==",
       "dev": true,
       "requires": {
-        "babel-plugin-debug-macros": "0.1.11",
+        "babel-plugin-debug-macros": "0.2.0",
         "ember-cli-version-checker": "2.1.2",
         "semver": "5.5.1"
       },
       "dependencies": {
+        "babel-plugin-debug-macros": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.2.0.tgz",
+          "integrity": "sha512-Wpmw4TbhR3Eq2t3W51eBAQSdKlr+uAyF0GI4GtPfMCD12Y4cIdpKC9l0RjNTH/P9isFypSqqewMPm7//fnZlNA==",
+          "dev": true,
+          "requires": {
+            "semver": "5.5.1"
+          }
+        },
         "ember-cli-version-checker": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ember-cli-version-checker/-/ember-cli-version-checker-2.1.2.tgz",
@@ -6658,12 +6780,12 @@
       }
     },
     "ember-data": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/ember-data/-/ember-data-3.4.2.tgz",
-      "integrity": "sha512-YYvNDNJ0ySiLED7xUxsR3TdRycCKQ7Avy5QIFc7PajDUODppZBqye1XCfJFDSZQ0sjs5w19mKntOVwsVdQGXIw==",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/ember-data/-/ember-data-3.5.0.tgz",
+      "integrity": "sha512-BVfObUyajwP93/dTeSiCSUQSU28EVLsq2G8OithwnAgxg2Neupln2cnRBW2+Gv4JzWwUFk075GcuL7qsD+xNmQ==",
       "dev": true,
       "requires": {
-        "@ember/ordered-set": "2.0.0",
+        "@ember/ordered-set": "2.0.3",
         "babel-plugin-feature-flags": "0.3.1",
         "babel-plugin-filter-imports": "0.3.1",
         "babel-plugin-transform-es2015-block-scoping": "6.26.0",
@@ -6676,7 +6798,7 @@
         "broccoli-rollup": "2.1.1",
         "calculate-cache-key-for-tree": "1.1.0",
         "chalk": "2.4.1",
-        "ember-cli-babel": "6.16.0",
+        "ember-cli-babel": "6.17.2",
         "ember-cli-path-utils": "1.0.0",
         "ember-cli-string-utils": "1.1.0",
         "ember-cli-test-info": "1.0.0",
@@ -6700,6 +6822,15 @@
             "color-convert": "1.9.1"
           }
         },
+        "babel-plugin-debug-macros": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.2.0.tgz",
+          "integrity": "sha512-Wpmw4TbhR3Eq2t3W51eBAQSdKlr+uAyF0GI4GtPfMCD12Y4cIdpKC9l0RjNTH/P9isFypSqqewMPm7//fnZlNA==",
+          "dev": true,
+          "requires": {
+            "semver": "5.5.1"
+          }
+        },
         "broccoli-file-creator": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/broccoli-file-creator/-/broccoli-file-creator-2.1.1.tgz",
@@ -6763,6 +6894,27 @@
             "supports-color": "5.5.0"
           }
         },
+        "ember-cli-babel": {
+          "version": "6.17.2",
+          "resolved": "https://registry.npmjs.org/ember-cli-babel/-/ember-cli-babel-6.17.2.tgz",
+          "integrity": "sha512-9KcCvF1PcelEFTSiJ/Ld20tfuW9acMkwHC/xINLsmwqJVDbm3oEqWtiFDZ5ebaC278O5I0GqNJWJLYNoWMNZ8g==",
+          "dev": true,
+          "requires": {
+            "amd-name-resolver": "1.2.0",
+            "babel-plugin-debug-macros": "0.2.0",
+            "babel-plugin-ember-modules-api-polyfill": "2.5.0",
+            "babel-plugin-transform-es2015-modules-amd": "6.24.1",
+            "babel-polyfill": "6.26.0",
+            "babel-preset-env": "1.7.0",
+            "broccoli-babel-transpiler": "6.5.0",
+            "broccoli-debug": "0.6.4",
+            "broccoli-funnel": "2.0.1",
+            "broccoli-source": "1.1.0",
+            "clone": "2.1.1",
+            "ember-cli-version-checker": "2.1.2",
+            "semver": "5.5.1"
+          }
+        },
         "ember-cli-version-checker": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ember-cli-version-checker/-/ember-cli-version-checker-2.1.2.tgz",
@@ -7244,7 +7396,70 @@
       "integrity": "sha512-tLWfYolZAkLnkTvvBkjizy4Wmj8yI8wqHZFK+leh0iScHiC3r1Yh5C4qO+OMGiBTMLwfTy+YqVoE/Nu3hGNkcA==",
       "dev": true,
       "requires": {
-        "ember-cli-babel": "6.16.0"
+        "ember-cli-babel": "6.17.2"
+      },
+      "dependencies": {
+        "babel-plugin-debug-macros": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.2.0.tgz",
+          "integrity": "sha512-Wpmw4TbhR3Eq2t3W51eBAQSdKlr+uAyF0GI4GtPfMCD12Y4cIdpKC9l0RjNTH/P9isFypSqqewMPm7//fnZlNA==",
+          "dev": true,
+          "requires": {
+            "semver": "5.5.1"
+          }
+        },
+        "broccoli-funnel": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/broccoli-funnel/-/broccoli-funnel-2.0.1.tgz",
+          "integrity": "sha512-C8Lnp9TVsSSiZMGEF16C0dCiNg2oJqUKwuZ1K4kVC6qRPG/2Cj/rtB5kRCC9qEbwqhX71bDbfHROx0L3J7zXQg==",
+          "dev": true,
+          "requires": {
+            "array-equal": "1.0.0",
+            "blank-object": "1.0.2",
+            "broccoli-plugin": "1.3.0",
+            "debug": "2.6.9",
+            "fast-ordered-set": "1.0.3",
+            "fs-tree-diff": "0.5.7",
+            "heimdalljs": "0.2.5",
+            "minimatch": "3.0.4",
+            "mkdirp": "0.5.1",
+            "path-posix": "1.0.0",
+            "rimraf": "2.6.2",
+            "symlink-or-copy": "1.1.8",
+            "walk-sync": "0.3.2"
+          }
+        },
+        "ember-cli-babel": {
+          "version": "6.17.2",
+          "resolved": "https://registry.npmjs.org/ember-cli-babel/-/ember-cli-babel-6.17.2.tgz",
+          "integrity": "sha512-9KcCvF1PcelEFTSiJ/Ld20tfuW9acMkwHC/xINLsmwqJVDbm3oEqWtiFDZ5ebaC278O5I0GqNJWJLYNoWMNZ8g==",
+          "dev": true,
+          "requires": {
+            "amd-name-resolver": "1.2.0",
+            "babel-plugin-debug-macros": "0.2.0",
+            "babel-plugin-ember-modules-api-polyfill": "2.5.0",
+            "babel-plugin-transform-es2015-modules-amd": "6.24.1",
+            "babel-polyfill": "6.26.0",
+            "babel-preset-env": "1.7.0",
+            "broccoli-babel-transpiler": "6.5.0",
+            "broccoli-debug": "0.6.4",
+            "broccoli-funnel": "2.0.1",
+            "broccoli-source": "1.1.0",
+            "clone": "2.1.1",
+            "ember-cli-version-checker": "2.1.2",
+            "semver": "5.5.1"
+          }
+        },
+        "ember-cli-version-checker": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ember-cli-version-checker/-/ember-cli-version-checker-2.1.2.tgz",
+          "integrity": "sha512-sjkHGr4IGXnO3EUcY21380Xo9Qf6bC8HWH4D62bVnrQop/8uha5XgMQRoAflMCeH6suMrezQL287JUoYc2smEw==",
+          "dev": true,
+          "requires": {
+            "resolve": "1.5.0",
+            "semver": "5.5.1"
+          }
+        }
       }
     },
     "ember-load-initializers": {
diff --git a/package.json b/package.json
index 52fdd5e6..ad87d5eb 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "ember-cli-uglify": "^2.1.0",
     "ember-composable-helpers": "2.1.0",
     "ember-concurrency": "0.8.21",
-    "ember-data": "~3.4.2",
+    "ember-data": "~3.5.0",
     "ember-export-application-global": "^2.0.0",
     "ember-load-initializers": "^1.1.0",
     "ember-moment": "7.8.0",
diff --git a/yarn.lock b/yarn.lock
index 4c23a8f2..2398df30 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3582,9 +3582,9 @@ ember-copy@^1.0.0:
   dependencies:
     ember-cli-babel "^6.6.0"
 
-ember-data@~3.4.2:
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/ember-data/-/ember-data-3.4.2.tgz#675cc4f1be8df1f5c0bfe4191afa6986377721c0"
+ember-data@~3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/ember-data/-/ember-data-3.5.0.tgz#1cd22312112fd3a961248090eac850d513f844cf"
   dependencies:
     "@ember/ordered-set" "^2.0.0"
     babel-plugin-feature-flags "^0.3.1"