Capitalize correctly when filter name contains underscore
Bump version to 2.5.1.pre
Merge pull request #198 from llh1/uat

Fix model to filter class name
Bump version to 2.5.1.rc1
Merge remote-tracking branch 'sanger/uat' into 58500284_merge_uat_and_v3

Conflicts:
	Gemfile.lock
	lib/lims-core/version.rb
mannually merged sanger development branch