Now the var is "editors", not "overrideDefaultEditors"
Test editInOSMOptions before including control

We need to be able to include the files AND to not display the control,
for example to include it programmatically after some action.
Merge branch 'master' into gh-pages