Remove several unused variables
Merge branch 'refactor' of git://github.com/spotweb/spotweb into refactor
Sorted permission lists