refactor shopup2
Merge branch 'master' of github:jrperdomoz/shopup