cleanup
Merge pull request #838 from marcel-blonk/PLFM-2333

cleanup
Added wikis to community object, some cleanup based on previous code review
Merge pull request #840 from marcel-blonk/develop

Added wikis to community object, some cleanup based on previous code rev...
Merge branch 'develop' into table-query