removed pycrypto leaving only strxor for speeding up pbkdf2
fixed conflict
Merge pull request #140 from carpaIdea/master

files toggle in admin, maybe as Massimo would want it