Revert "Revert "Merge branch 'master' of https://github.com/srophe/srophe-eXist-app""

This reverts commit 4161555098da91b99f0d5c50f540606b5571723c.