Added UserService and Dao, completed sign up with email verification feature.
Solved merge conflicts with master origin