CHECK: Committing current changes, Max doesn't see the changes
Merge branch 'media-plugin' of github.com:wysiwhat/Aloha-Editor into media-plugin