Added User Authentication
Merge origin/master