fixed order of arguments for PBKDF2 functions
Merge branch 'master' of github.com:Wolframe/Wolframe