shop push 19
merge 2

Merge branch 'master' of http://github.com/awidarto/shopfair