sign up functioning well + validation
merg conflict fix
merge to develop