fixes #1900
fixes #1899
Change pool category class location

In order to make blacklisting by category easier.
#1875: Add support for dialog when uploading
Merge branch 'master' of https://github.com/r888888888/danbooru