Merge branch 'uat'

Conflicts:
	Gemfile.lock
	lib/lims-laboratory-app/version.rb
Bump version numbers; RNA QC
Update Gemfile.lock
Merge pull request #63 from llh1/development

Remove out_of_bounds parameter from the aliquot persistor
Merge pull request #64 from llh1/development

Disable logger related specs
Add migration for primary_keys table
Bump version to 3.0.2
Extract sample creation in a create sample shared module
Add comment
Refactor tube and container resource creation to use the create sample shared
Bump version to 2.5.12.pre
Merge pull request #65 from llh1/57468824_fix_sample_creation_through_create_plate_action

57468824 fix sample creation through create plate action
Add specs for plate and gel creation with sample uuids
Merge branch 'uat' of github.com:sanger/lims-laboratory-app into 57468824_fix_sample_creation_through_create_plate_action
Merge pull request #66 from llh1/57468824_fix_sample_creation_through_create_plate_action

57468824 fix sample creation through create plate action : Add specs
Add unique index on table_name column
Merge pull request #67 from llh1/migration_for_primary_keys

Migration for primary_keys table
Squashed commit of the following:

commit 88d50ccdeb0be3056bddf3a5be3ea13f193a99de
Author: max <bmx007@gmail.com>
Date:   Tue Sep 24 17:30:06 2013 +0100

    remove require ruby-prof in specs.

commit 29ba5d497a5e35ae70edc4f96f45b9f7b6c8a1ab
Author: max <bmx007@gmail.com>
Date:   Tue Sep 24 17:21:59 2013 +0100

    Profile bulk tube creation benchmark.

commit 5d0dae8c865a4e51423290af7e002ed19bfed441
Author: max <bmx007@gmail.com>
Date:   Tue Sep 24 16:42:36 2013 +0100

    Add empty tube bulk creation benchmark.

commit 6a82805aad3f86febdf1e40d5f8433ece6a4ee1c
Author: max <bmx007@gmail.com>
Date:   Tue Sep 17 09:32:57 2013 +0100

    Update lims-core version.
Fix tube benchmark specs.
Update core version to speed up uuid generation.