Merge remote-tracking branch 'ParsePlatform/master' into user-roles

Author: Francis Lessard

bin/parse-server

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 var express = require('express');
-var ParseServer = require("../lib/index").ParseServer;
+var ParseServer = require("../src/index").ParseServer;
 
 var app = express();