diff --git a/.gitignore b/.gitignore
old mode 100755
new mode 100644
diff --git a/README.md b/README.md
old mode 100755
new mode 100644
diff --git a/app/models/Invite.js b/app/models/Invite.js
old mode 100755
new mode 100644
diff --git a/app/models/Key.js b/app/models/Key.js
old mode 100755
new mode 100644
diff --git a/app/models/Upload.js b/app/models/Upload.js
old mode 100755
new mode 100644
diff --git a/app/models/User.js b/app/models/User.js
old mode 100755
new mode 100644
diff --git a/app/public/css/form.css b/app/public/css/form.css
old mode 100755
new mode 100644
diff --git a/app/public/css/form.min.css b/app/public/css/form.min.css
old mode 100755
new mode 100644
diff --git a/app/public/css/home.css b/app/public/css/home.css
old mode 100755
new mode 100644
diff --git a/app/public/css/home.min.css b/app/public/css/home.min.css
old mode 100755
new mode 100644
diff --git a/app/public/css/index.css b/app/public/css/index.css
old mode 100755
new mode 100644
diff --git a/app/public/css/index.min.css b/app/public/css/index.min.css
old mode 100755
new mode 100644
diff --git a/app/public/css/panel.css b/app/public/css/panel.css
old mode 100755
new mode 100644
diff --git a/app/public/css/panel.min.css b/app/public/css/panel.min.css
old mode 100755
new mode 100644
diff --git a/app/public/index/typegraph.js b/app/public/index/typegraph.js
old mode 100755
new mode 100644
diff --git a/app/public/panel/controllers/ApiCtrl.js b/app/public/panel/controllers/ApiCtrl.js
old mode 100755
new mode 100644
diff --git a/app/public/panel/controllers/NavCtrl.js b/app/public/panel/controllers/NavCtrl.js
old mode 100755
new mode 100644
index 20fb1d0..07891ea
--- a/app/public/panel/controllers/NavCtrl.js
+++ b/app/public/panel/controllers/NavCtrl.js
@@ -3,7 +3,7 @@ var angular = require('angular');
 angular.module('NavCtrl', ['AuthSvc']).controller('NavController', ['$scope', '$window', 'AuthService', function($scope, $window, AuthService) {
     $scope.user = {};
     AuthService.currentUser(function(user) {
-        $scope.user = user;
+        $scope.user = username;
     });
 
     $scope.logout = AuthService.logout;
@@ -12,5 +12,4 @@ angular.module('NavCtrl', ['AuthSvc']).controller('NavController', ['$scope', '$
         if (!$scope.user.scope) return false;
         return $scope.user.scope.indexOf(permission) !== -1;
     };
-
 }]);
\ No newline at end of file
diff --git a/app/public/panel/routes.js b/app/public/panel/routes.js
old mode 100755
new mode 100644
diff --git a/app/public/panel/shimapan-panel.js b/app/public/panel/shimapan-panel.js
old mode 100755
new mode 100644
diff --git a/app/public/services/ApiSvc.js b/app/public/services/ApiSvc.js
old mode 100755
new mode 100644
diff --git a/app/public/services/AuthSvc.js b/app/public/services/AuthSvc.js
old mode 100755
new mode 100644
diff --git a/app/public/shimapan/components/LoginComp.js b/app/public/shimapan/components/LoginComp.js
old mode 100755
new mode 100644
diff --git a/app/public/shimapan/components/RegisterComp.js b/app/public/shimapan/components/RegisterComp.js
old mode 100755
new mode 100644
diff --git a/app/public/shimapan/components/UploadComp.js b/app/public/shimapan/components/UploadComp.js
old mode 100755
new mode 100644
diff --git a/app/public/shimapan/shimapan.js b/app/public/shimapan/shimapan.js
old mode 100755
new mode 100644
diff --git a/app/routes/auth.js b/app/routes/auth.js
old mode 100755
new mode 100644
index 3de29fa..f2d73da
--- a/app/routes/auth.js
+++ b/app/routes/auth.js
@@ -69,8 +69,8 @@ function setupSession(username, req, res, cb) {
     passport.authenticate('local')(req, res, function () {
         req.session.save(function (err) {
             if (!err) {
-                req.session.username = username;
-                req.session.canonicalname = canonicalize(username);
+                req.session.passport.username = username;
+                req.session.passport.canonicalname = canonicalize(username);
             }
             cb(err);
         });
@@ -114,8 +114,8 @@ router.post('/login', function (req, res, next) {
                 req.logIn(user, cb);
         },
         function (cb) {
-            req.session.username = req.body.username;
-            req.session.canonicalname = canonicalize(req.body.username);
+            req.session.passport.username = req.body.username;
+            req.session.passport.canonicalname = canonicalize(req.body.username);
             cb();
         }
     ], function (err) {
@@ -132,6 +132,7 @@ router.get('/logout', function (req, res) {
 });
 
 router.get('/session', function (req, res) {
+    console.log(req.session.passport);
     if (req.session.passport.canonicalname) {
         User.findOne({canonicalname: req.session.passport.canonicalname}, function (err, user) {
             res.status(200).json({
diff --git a/app/routes/home.js b/app/routes/home.js
old mode 100755
new mode 100644
diff --git a/app/routes/index.js b/app/routes/index.js
old mode 100755
new mode 100644
diff --git a/app/routes/keys.js b/app/routes/keys.js
old mode 100755
new mode 100644
diff --git a/app/routes/login.js b/app/routes/login.js
old mode 100755
new mode 100644
diff --git a/app/routes/panel.js b/app/routes/panel.js
old mode 100755
new mode 100644
diff --git a/app/routes/register.js b/app/routes/register.js
old mode 100755
new mode 100644
diff --git a/app/routes/routes.js b/app/routes/routes.js
old mode 100755
new mode 100644
diff --git a/app/routes/upload.js b/app/routes/upload.js
old mode 100755
new mode 100644
diff --git a/app/routes/view.js b/app/routes/view.js
old mode 100755
new mode 100644
diff --git a/config/default.json b/config/default.json
old mode 100755
new mode 100644
diff --git a/config/dev.json b/config/dev.json
old mode 100755
new mode 100644
diff --git a/config/passport.js b/config/passport.js
old mode 100755
new mode 100644
diff --git a/config/test.json b/config/test.json
old mode 100755
new mode 100644
diff --git a/gulpfile.js b/gulpfile.js
old mode 100755
new mode 100644
diff --git a/package-lock.json b/package-lock.json
old mode 100755
new mode 100644
diff --git a/package.json b/package.json
old mode 100755
new mode 100644
diff --git a/public/img/edge.mp4 b/public/img/edge.mp4
old mode 100755
new mode 100644
diff --git a/public/img/flower.png b/public/img/flower.png
old mode 100755
new mode 100644
diff --git a/public/img/glyphicons-512-copy.png b/public/img/glyphicons-512-copy.png
old mode 100755
new mode 100644
diff --git a/public/views/home.html b/public/views/home.html
old mode 100755
new mode 100644
diff --git a/public/views/index.html b/public/views/index.html
old mode 100755
new mode 100644
diff --git a/public/views/login.html b/public/views/login.html
old mode 100755
new mode 100644
diff --git a/public/views/panel.html b/public/views/panel.html
old mode 100755
new mode 100644
diff --git a/public/views/panel/api.html b/public/views/panel/api.html
old mode 100755
new mode 100644
diff --git a/public/views/panel/dash.html b/public/views/panel/dash.html
old mode 100755
new mode 100644
diff --git a/public/views/panel/invites.html b/public/views/panel/invites.html
old mode 100755
new mode 100644
diff --git a/public/views/panel/search.html b/public/views/panel/search.html
old mode 100755
new mode 100644
diff --git a/public/views/panel/stats.html b/public/views/panel/stats.html
old mode 100755
new mode 100644
diff --git a/public/views/panel/users.html b/public/views/panel/users.html
old mode 100755
new mode 100644
diff --git a/public/views/register.html b/public/views/register.html
old mode 100755
new mode 100644
diff --git a/public/views/shimapan/login-form.html b/public/views/shimapan/login-form.html
old mode 100755
new mode 100644
diff --git a/public/views/shimapan/register-form.html b/public/views/shimapan/register-form.html
old mode 100755
new mode 100644
diff --git a/public/views/shimapan/upload-form.html b/public/views/shimapan/upload-form.html
old mode 100755
new mode 100644
diff --git a/test/api.js b/test/api.js
old mode 100755
new mode 100644
diff --git a/test/test.png b/test/test.png
old mode 100755
new mode 100644
diff --git a/test/testUtil.js b/test/testUtil.js
old mode 100755
new mode 100644