Added user authentication
Merged sorcery branch
Merged master with sorcery