fixed merge errors
Merge branch 'develop' into feature/AllApps