Added base User resource.
added email and password column
Merge master changes