added more fields to signup form
fixed merge conflict
fixed merge conflicts