Added basic user model with authentication
merged users
fixed gemlock