Changing error message
Merge pull request #235 from pranavparikh/master

Error handling for JSON parsing in webservice controller
Merge branch 'dataDrivenDescriptor'