started
changed all old style XML objects to JSONEntity
fixing build
added missing files
Merge pull request #579 from eric-wu/release-6

Give the owner the right to participate
working build
Merge pull request #581 from john-hill/PLFM-2064

Plfm 2064
Merge pull request #582 from john-hill/PLFM-2064

Plfm 2064
Merge branch 'develop' into PLFM-2038
javadoc for Wiki Controller
Merge pull request #587 from eric-wu/develop

Add ACLs to evaluation and participant methods
fix for PLFM-2079
code review tests
code review tests2
Merge pull request #588 from john-hill/PLFM-2079

fix for PLFM-2079
Merge branch 'develop' into PLFM-2079
Merge pull request #590 from john-hill/PLFM-2079

Plfm 2079
PLFM-2051: in progress
lowercase once
addressed code review changes