Merge branch 'master' into improve_coverage_test_server
Complete curl commands for user authentication and delete
Merge branch 'pending_user_integration' of https://github.com/Roxana28/share-system-team2 into pending_user_integration
Added user authentication and delete curl command
Renamed method create_user into activate_user because the user is created (on disk) after the integration of pending_users data. So this function actually activates the user, after it was previously created.
Merge branch 'pending_user_integration' of https://github.com/Roxana28/share-system-team2 into pending_user_integration
Integration of pending users on disk so pending_users dictionary was eliminated.
All users are saved on disk (into file userdata.json) and have a flag, activated, set to true if the user is active or false if it's waiting for activation.
Changed function create_user into activate_user (which is now called with a PUT request).
Test of pending users integration.
Changed name function _manually_create_user into _manually_create_active_user which creates a user with flag active: True
Replaced POST action response from HTTP_OK to HTTP_CREATED because if an user is missing from disk (userdata.json) it's actually created with the POST action.
Added two functions:
_manually_create_inactive_user that creates a user with flag activated:False and saves it on disk;
_manually_remove_inactive_user that removes the user created with previous function from disk.
Modified method test_repeated_post.
This method test that every POST request of an inactive user returns HTTP_OK.
It means that user actually exists but it has the flag activated set to False.
Added method test_creation_inactive_user which for every new user POST request returns HTTP_CREATED.
Merge branch 'master' into pending_user_integration
Changed old function create_user into activate_user because what it does is to activate an already existing user and save it into userdata.json
Added function create_user that handles the creation of a new user and saves its data into userdata.json.
Both activate_user and create_user functions add a new key to users data which is false when create a new user and true when activate it.
save userdata on disk after user deletion
Code refactoring for the integration of pending users into userdata dict,
there's no more 'pending_users' variable.

Now every user is created, via POST request, with the flag 'active': False
and becomes 'active': True via PUT request.
usertips update and fix
Merge branch 'pending_user_integration' of https://github.com/Roxana28/share-system-team2 into pending_user_integration

Conflicts:
	server/server.py
	server/test_server.py
	server/usertips.txt

strange merge (no changes)
Merge branch 'master' into pending_user_integration

Conflicts:
	server/server.py
	server/usertips.txt

Note: quite difficult manual conflict resolution of server.py
due to pending_users_integration refactoring