Merge pull request #214 from jay-hodgson/release-1.22

in staging, test mode should show wiki widget for Projects and Folders
merge SWC-456 up from develop