remove netbeans files
Merge branch 'develop' of github.com:ontop/ontop into develop
fix typos
Merge branch 'develop' of github.com:ontop/ontop into develop