Remove User bugfix, Button text fix
Merge branch 'master' of https://github.com/Para-dox/OPDB.git