Added new service categories for Biocatalogue
Added RNA Analysis as a subclass of Sequence Analysis
Announcement view made wrong call to prepare_annotation_description method
Merge branch 'markdown'

* markdown:
  Announcement view made wrong call to prepare_annotation_description method
Fixed bug concerning adding an inline default value to a rest parameter.

The problem was the form did not include an ID so the callback wouldn't work.
Added html_safe tag to description fields in service provider index
Only admins could upload service provider logos. Set it so anyone can
Added link to logo URL in the  XML representation of service provider
Set logo alignment to be vertically in the middle
Added new service categories
Bumped up the API version number after latest changes to API, including adding provider logo.
Merge branch 'biocat-master' into biovel-master

Conflicts:
	data/service_categories.yml.pre