Merge pull request #918 from dennishendriksen/master

Fix accidental rename of compilation unit
Fix for dataexplorer to entityexplorer link