0.5.12
Merge branch 'master' of http://github.com/punkave/apostrophe-editor-2
new version to resolve conflict