fix users
add files
Merge branch 'develop'
conf
Merge branch 'master' of github.com:kossgreim/ysa-activity