mofidy db character and enable type query for api (api/getshoplist?type=xxx)
Merge branch 'develop' of https://github.com/HungryKid/hungrykid into develop

Conflicts:
	.gitignore