Added <editor>, updated places
Merge branch 'master' of https://github.com/paregorios/srpdemo1