User manager interface
Merge branch 'develop' of https://github.com/bmael/ReallySweetSadistic into develop