222
Merge branch 'master' of github.com:allen2/jy
add shop categray edge support