changes itin element button to edit
Merge branch 'master' into gh-pages