update user page
Merge branch 'master' into dev
update permission + change user password
add some field
hot fix no event bug
hotfix login error
admin can change pass without entering current password
added datapushurl to account
fix a typo
merge
Merge branch 'dev'
add api auth route