Added Gregs changes into this new branch
Added option to option group
Fix to locator
Locator refactor
Updated Version 3.3.016.054
Merge branch 'develop' into feature