update edit_user and run
Merge branch 'master' of https://github.com/lukeeee/Royal-Hearts