removed target directory. its created by maven and also contains userspecific data. would permanently cause conficts
Merge branch 'master' into develop
Merge branch 'develop' of https://github.com/Jather90/AMOS_proj5 into develop