Move static code to ShopTask + rename/add properties
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/comic/mycomic/shop/mycomicshop/MyComicShopTask.java