Merge pull request #396 from jay-hodgson/SWC-471-patch

SWC-471: move user evaluation state to Synapse java client
Merge pull request #393 from john-hill/PLFM-1830-A

Plfm 1830 a
Merge pull request #398 from xschildw/PLFM-1859

PLFM-1859: Handle null entity bundle in submissionDAO
Merge branch 'PLFM-1805_4-2013' into SWC-471-patch2
Merge pull request #400 from jay-hodgson/SWC-471-patch2

Swc 471 patch2 (have to merge up plfm-1805 as SWC-471 is dependent on it)
Merge branch 'release-1.24' into develop