added gender to user
schema updated
resolved conflicts from rebase
fixed bug
bug fix