Fix for getting the text value off Annotation and TextValue objects, display name for a service and checking for nil error messages.
Merge branch 'rails3' of github.com:myGrid/biocatalogue into rails3