changes for signup and login
merge conflict resolved night Dec 14