added user model
added locations activity
added method for GET requests
'Locations' button directs to locations activity
fixed conflicts