more work on #1518

still needs more work, category is next
Merge branch 'master' of https://github.com/designcreateplay/NodeBB