Admin work
Add password field to admin users form
Merge remote-tracking branch 'phran/integration' into integration