Merge branch 'master' of github.com:FreeMusicNinja/freemusic.ninja
Merge branch 'master' of github.com:FreeMusicNinja/freemusic.ninja
Fix user name on save (not just on clean)