fixed: to many folders
fix some problems
Merge remote-tracking branch 'origin/activities' into merge_branch