Integration with HoloEverywhere
Merge branch 'develop' into holoeverywhere
Fixing holoeverywhere integration
Merge branch 'holoeverywhere' into develop
Fixes #411