Some markup changes, prevent of NPE, some code simplification
Merge branch 'develop' of github.com:eXist-db/exist into feature/rework_lucene_classes
Merge branch 'feature/rework_lucene_classes' into develop
Merge pull request #115 from dizzzz/develop

Finalizing restructuring