merge with master
merge with master
table wish working with image
Stable version, delete detect and add items in array, refactoring code loadJson moved to utils
Merge with Master
Merge with Master