Remember toolbar state & code comments
Merge branch 'master' of https://github.com/michelsteege/silverstripe-frontend-editing