Added user management system
Merge branches 'master' and 'authentication'