added user authentication system
Merge branch 'master' into mywork