Used gsub! when I meant gsub in annotations_helper. Fixed now.
Merge branch 'biocat-master' into biovel-master

Conflicts:
	app/helpers/annotations_helper.rb