Merge branch 'feature-editor' of github.com:iresults/sourcero into feature-editor