Good merge of the viewer
Merge branch 'master' of https://github.com/hackathon-iamd/lod