Making the unit- and integration tests working again.
Added files to ignore.
Commit changes after merge with develop.
Added some fixes
Merge branch 'feature/smallReleaseFixes' into develop
Project restructured to one java project.