update
del
Merge branch 'master' of https://github.com/serweb-labs/shopp