updated sign in and registration on server
fixed merge conflicts