Merge branch 'develop'
fix url to data.json
Merge branch 'hotfix-1' into develop