Misc user changes
Merge branch 'master' of github.com:Karsone/Vinventory