Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into netflux

.jshintignore

@@ -11,3 +11,6 @@ www/code/rangy.js
 storage/kad.js
 www/common/otaml.js
 www/common/diffDOM.js
+www/common/netflux.js
+NetFluxWebsocketServer.js
+WebRTCSrv.js

www/input/main.js

@@ -33,7 +33,7 @@ define([
         websocketURL: Config.websocketURL,
         userName: Crypto.rand64(8),
         channel: key.channel,
-        key.cryptKey
+        cryptKey: key.cryptKey
     };
 
     var rttext = RTText.start(config);