fix users
add files
Merge branch 'develop' into vetal-develop