Merge branch 'api-v3' into api-v3-i18n

test/server_side/webhooks.test.js

@@ -4,7 +4,7 @@ chai.use(require("sinon-chai"))
 var expect = chai.expect
 var rewire = require('rewire');
 
-var webhook = rewire('../../website/src/libs/webhook');
+var webhook = rewire('../../website/src/libs/api-v2/webhook');
 
 describe('webhooks', function() {
   var postSpy;

website/src/libs/api-v2/analytics.js

@@ -1,7 +1,7 @@
 require('./api-v2/i18n');
 
 var _ = require('lodash');
-var Content = require('../../../common').content;
+var Content = require('../../../../common').content;
 var Amplitude = require('amplitude');
 var googleAnalytics = require('universal-analytics');