removed merge conflict, added password-handling w SHA2-hashing
added configuration-attribute for hash-rounds
added session-handling