Merge branch 'develop' into api-v3

test/api/README.md

@@ -41,7 +41,7 @@ $ gulp test:api:safe
 If you'd like to run the tests individually and inspect the output from the server, in one pane you can run:
 
 ```bash
-$ gulp nodemon
+$ gulp test:nodemon
 ```
 
 And run your tests in another pane:

test/api/v3/integration/user/POST-user-update-email.test.js

@@ -4,7 +4,7 @@ import {
 } from '../../../../helpers/api-v3-integration.helper';
 import { model as User } from '../../../../../website/src/models/user';
 
-describe.only('POST /email/update', () => {
+describe('POST /email/update', () => {
   let user;
   let fbUser;
   let endpoint = '/user/update-email';