add user_type combo
dockerfile
Merge branch 'dev'