Merge branch 'master' into develop

Author: Mike Nikles

CHANGELOG

@@ -8,6 +8,7 @@
     - Add a new ES5 configuration ported to ESLint 2 and up
 2.5.1
     - Update line length to 200
+    - Remove rule for no-unresolved import
     - Remove 'strict' rule for modules
 2.5.0
     - Add an ES6 and JSX standard with lint rules.

RELEASE.md

@@ -0,0 +1,15 @@
+## Mobify Code Style
+- [ ] Branch off of `develop` and create a `release-vX.Y.Z` branch.
+- [ ] Create a new pull request with the following settings:
+      * Base: `master`
+      * Compare: `release-vX.Y.Z`
+      Paste the contents of this checklist into this pull request.
+- [ ] Increment the version in `package.json`.
+- [ ] In the CHANGELOG.md file of this release branch, change the 'To be released' header to 'vX.Y.Z'.
+- [ ] Merge `release-vX.Y.Z` into `master` using the pull request, then delete the release branch.
+- [ ] [Publish to npm](https://docs.npmjs.com/cli/publish) from the `master` branch.
+- [ ] Draft a new Github release with the following settings:
+      * Tag version: `X.Y.Z` @ `master`
+      * Release title: `X.Y.Z`
+      * Description: Use highlights from the CHANGELOG.md (only pick out the most significant changes)
+- [ ] Merge `master` into `develop` (no need for review on PR, just merge).

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mobify-code-style",
-  "version": "2.5.0",
+  "version": "2.5.2",
   "description": "Code style guide and linting tools for Mobify",
   "repository": {
     "type": "git",