updated message model
merged from inventory
Implemented User model
fixed conflicts
resolved user model conflicts
routes for inventory