ESSENTIALS-255: Align content blocks plugin name with other existing names.
ESSENTIALS-215: Improve placement of CMS edit buttons.
Merge branch 'master' of github.com:onehippo/essentials