fix lorenzo's merge bugs
Fix Capybara test.

Item overlapping issue so used trigger('click') method
Refactor MASEditor

Failing cucumber tests
Keeps toolbar enabled
Merge branch 'maseditor-refactor' of github.com:moneyadviceservice/cms into maseditor-refactor