Fixed grammar
FS-15 FS-16 FS-25 remove file
Merge branch 'master' of https://github.com/Fides-Storage/Client
FS-15 FS-16 FS-25 Added tests
FS-15 FS-16 FS-25 Removed 5 seconds check
FS-15 FS-16 FS-25 trigger remove on folderchange
FS-15 FS-16 FS-25 Javadoc implemented
FS-15 FS-16 FS-25 added javadoc and checks
FS-15 FS-16 FS-25 Fixed format
Merge branch 'FS-15_FS-16_FS-25_remove_files'
Merge errors fixed
Merge branch 'master' into FS-28_Concurrency

Conflicts:
	src/main/java/org/fides/client/connector/ServerConnector.java
	src/main/java/org/fides/client/files/FileSyncManager.java