Add subtype to topics to classify private messages
improve category edit button copy
Merge remote-tracking branch 'upstream/master'