User auth

Branches merging.