FS-24: Working on the File Request.
Merge branch 'master' into FS-24_-_File_request

Conflicts:
	src/main/java/org/fides/server/files/FileManager.java
FS-24: Moved part of the FileManager's responsibility to the ClientFileConnector.
FS-24: Finished the tests for uploading&updating&downloading of normal files.
Merge branch 'master' into FS-24_-_File_request

Conflicts:
	src/main/java/org/fides/server/Client.java
	src/main/java/org/fides/server/files/UserManager.java
	src/test/java/org/fides/server/ClientTest.java
FS-1 FS-2: Fix in ClientTest
SF-1 SF-2: Fixed test
FS-24: Finished the tests for ClientFileConnector (still needs some cleaning, but everything works)
FS-24: Cleaned some code
FS-24: Added server functionality for all actions.
Merge branch 'master' into FS-24_-_File_request

Conflicts:
	src/main/java/org/fides/server/tools/Actions.java
	src/test/java/org/fides/server/ClientTest.java
FS-24: Fix mergeerror
FS-24 Reviewed
Merge branch 'FS-24_-_File_request'