add api table column config
Merge branch 'develop' of https://github.com/Sage-Bionetworks/Synapse-Repository-Services into develop
PLFM-1805: add access check based on ObjectType
Merge branch 'develop' of https://github.com/Sage-Bionetworks/Synapse-Repository-Services into PLFM-1805
almost done, but the test helper still needs to be fixed
Merge branch 'develop' of https://github.com/Sage-Bionetworks/Synapse-Repository-Services into develop
Merge branch 'develop' of https://github.com/Sage-Bionetworks/Synapse-Repository-Services into develop
Merge branch 'develop' of https://github.com/Sage-Bionetworks/Synapse-Repository-Services into develop
Merge branch 'develop' of https://github.com/Sage-Bionetworks/Synapse-Repository-Services into develop
Merge branch 'develop' of https://github.com/Sage-Bionetworks/Synapse-Repository-Services into develop
PLFM-1805: merge with develop
fix EntityServletTestHelper
Merge pull request #388 from jay-hodgson/PLFM-1805_4-2013

Plfm-1805: canAccess based on ObjectType and ACCESS_TYPE
Refresh from upstream develop