Merge branch 'master' of https://github.com/opcoach/contextExplorer
Merge branch 'CQ7865'