hide merge cells link (not ready yet)
Merge branch 'develop'
Merge branch 'master' into gh-pages