Fix merge links.
Merge branch 'master' of github.com:nerdfiles/core into develop
Spec on category-based messaging across clients.