v 0.04 manage_user has finished
Merge branch 'dev'