solve the Activities page async
Merge branch 'develop' of https://github.com/FityCity/FityCityApp into develop