Merge branch 'workflow_refactoring' of https://github.com/benoitmangili/s2_extraction_pipeline into Elution_Page_Functionality
Merge branch 'Elution_Page_Functionality' of http://github.com/mikemases/s2_extraction_pipeline into adding_roles_to_models
Testing whether the transfer is working for the kit presenter
correcting kit_presenter
Merge branch 'adding_roles_to_models' of https://github.com/david-allen-tessella/s2_extraction_pipeline into workflow_refactoring
Changes to get pipeline working on running S2

Removed references to test data JSON in requirements.
Added live configuration.
Barcodes changed to EAN13 for labware

Conflicts:
	app/scripts/app.js
	app/scripts/config.js
	app/scripts/default/default_model.js
	app/scripts/default/default_presenter.js
	app/scripts/models/base_page_model.js
	app/scripts/models/kit_model.js
	app/scripts/models/selection_page_model.js
	app/scripts/presenters/base_presenter.js
add mapper_services to test_config
correcting kit_presenter
Fixed kit validation
Merge branch 'working_with_s2_instance' of https://github.com/sanger/s2_extraction_pipeline into working_with_s2_instance

Conflicts:
	test/test_main.js
bug fixes for demo

Merge branch 'Elution_Page_Functionality' of https://github.com/mikemases/s2_extraction_pipeline into working_with_s2_instance

Conflicts:
	app/scripts/dna_and_rna_manual_extraction.json
	app/scripts/models/kit_binding_model.js
	app/scripts/presenters/kit_binding_page_presenter.js
bug fixes for demo

Merge branch 'Elution_Page_Functionality' of https://github.com/mikemases/s2_extraction_pipeline into working_with_s2_instance

Conflicts:
	app/scripts/dna_and_rna_manual_extraction.json
	app/scripts/models/kit_binding_model.js
	app/scripts/presenters/kit_binding_page_presenter.js
Merge branch 'master' of https://github.com/sanger/s2_extraction_pipeline into fix_for_working_with_s2
restored the config file +

Merge branch 'Elution_Page_Functionality' of https://github.com/mikemases/s2_extraction_pipeline into working_with_s2_instance

Conflicts:
	app/scripts/dna_and_rna_manual_extraction.json
	app/scripts/models/kit_binding_model.js
	app/scripts/presenters/kit_binding_page_presenter.js
renamed config and dev_config files
renamed config and dev_config files
renamed config and dev_config files
Merge pull request #39 from benoitmangili/fix_for_working_with_s2

Fix for working with s2