Merge pull request #630 from dburdick/swc-968

SWC-968 - fix non-file entity name/markdown editing
Merge pull request #632 from dburdick/swc-965

SWC-965 - fix admin issue on tox challenge
SWC-960 - data use change
swc-764 - show full file path
swc-954 - clean up join button styling
swc-922 - wiki subpage state issue with tabs
Merge pull request #635 from dburdick/swc-690

Swc 690