Merge branch 'websocket'

Conflicts:
	www/js/apps.js
	www/js/auth.js

1 files changed, 1 insertions, 1 deletions

diff --git a/www/js/router.js b/www/js/router.js
index d9d070f..cfeaf23 100644
--- a/www/js/router.js
+++ b/www/js/router.js
@@ -52,7 +52,7 @@ Rdxport.Router.prototype.route = function(page, subpage) {
   }
 
   if (!importer) {
-    importer = new Rdxport.Importer();
+    importer = new Rdxport.Importer(this.auth.username, this.auth.token);
     window.onbeforeunload = function(event) {
       if (importer.isUploading()) {
         return 'Achtung: Es laufen noch imports.';