Merge pull request #4 from ercchy/master

Bugfix for uploading image upon editing a badge
merged richtext-editor branch into master