Merge branch 'dev'
prod
add modal
sdsdf
change default user type
Merge branch 'master' into dev