Merge pull request #90 from jmsche/master

Wysiwyg improvements
(WIP) Bootstrap 3