Merge branch 'hotfix/1.4.1.2_3.1' into Development
This is not needed anymore.
Merge branch 'feature/Issues/64/Enhanced_Archiving' into Development
Merge pull request #72 from Firesphere/Development

Removed unneeded feature.