Update prior to merge
Manual merge with upstream
Merge branch 'master' of github.com:kreativkombinat/rms
Add svg and commit hero