Merge current state of User auth branch into master