Fix bug data parsing
Merge branch 'master' of https://github.com/apo-j/app_shop
Merge branch 'master' of https://github.com/apo-j/app_shop
UI