some comments added
permissions file modified
Merge branch 'master' of github.com:Yellowen/Faalis