in staging, test mode should show wiki widget for Projects and Folders
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
Merge pull request #220 from jay-hodgson/release-1.22

merge SWC-456 up from develop
PLFM-1792: patch production to roll back FileEntity support, until we have a way to reduce hops (during upload to S3).
Merge pull request #225 from jay-hodgson/release-1.22

PLFM-1792: patch production to roll back FileEntity support, until we ha...
SWC-473: fix synapse links
Merge pull request #226 from jay-hodgson/release-1.22

SWC-473: fix synapse links
Revert "PLFM-1792: patch production to roll back FileEntity support, until we have a way to reduce hops (during upload to S3)."

This reverts commit 63d64b450f60a817522cc2d6b8f436d1308edaa3.
update to new repo version
Merge pull request #227 from jay-hodgson/release-1.22

Revert "PLFM-1792: patch production to roll back FileEntity support, unt...
fix for swc-472
remove file size cap!
Merge pull request #229 from jay-hodgson/release-1.22

remove file size cap!
Merge pull request #228 from dburdick/develop

fix for swc-472
remove file size cap!
Merge pull request #230 from jay-hodgson/NO_CAP

remove file size cap!
Merged release-1.22 and resolved conflicts
SWC-466
Merge pull request #232 from dburdick/develop

SWC-466