Merge branch 'feature/felix_maven_plugin' into develop
Removed unnecessary import-package statement and the junit tests only scope of the junit dependency
Changed the Junit version in POM
removed unnecessary old file
Fixed infinite cycle bug
Fixed bug in test that fails while trying to create a file in C:/ if not in a Windows OS
Merge branch 'develop' into feature/felix_maven_plugin