Sync version number to 2.5-pre
Merge remote-tracking branch 'sanger/uat' into 56880524_merge_uat

Conflicts:
	Gemfile.lock
	lib/lims-core/version.rb
Merge pull request #192 from maxigit/56880524_merge_uat

56880524 merge uat