Upstream pull + Handle no categories#5

antazoey wants to merge 202 commits into

mastercode42/content:masterfrom

bugfix/fix-fetch-and-catchupcode42/content:bugfix/fix-fetch-and-catchupCopy head branch name to clipboard