Merge pull request #796 from KevWright/master

Enterprise editing
Link cleanup in UI page.
Disambiguate links to keywords.
No category necessary after all.
What's New updates for 3.6.
Fixed merge problem
Merge branch 'KevWright-master'