FS-1 FS-2 Updated common strings to static final strings
Merge branch 'FS-2' of https://github.com/Fides-Storage/Server into FS-2