removed merge conflict artifacts
Merge branch 'master' of https://github.com/52North/IlwisCore