User auth merge into main line to fix mistake

mistake: not pulling after a successful merge reqeust done

created a branch for user_auth, merging so that future user_auth changes will have bootstrap designs