merged fran edit-update section, changed: using DEV publish in it instead of STABLE
Merge branch 'fran-master'
merging