modified files
Merge branch 'master' of https://github.com/psahalot/smartshop-lite