Merge remote-tracking branch 'origin/extdb'
Merge branch 'master' of https://github.com/sd-demon/herofactory