Merge pull request #132 from cbare/develop

Updates to SubmissionStatus annotations and adding contentType to FileEntity
rolled version to patch release 0.5.2