user manager files
Merge branch 'master' of git://github.com/medy36/boom