clean up and first step of refactoring for the workflow
Merge branch 'master' of https://github.com/sanger/s2_extraction_pipeline into workflow_refactoring

Conflicts:
	app/scripts/app.js
	app/scripts/config.js
	app/scripts/models/selection_page_model.js
	app/scripts/pipeline_config.json
	app/scripts/presenters/selection_page_presenter.js
	app/scripts/workflow_engine.js
Merge branch 'master' of https://github.com/sanger/s2_extraction_pipeline into workflow_refactoring
Minor changes to the kit and scan barcode modules
merged
added role update to the selection_page_model
Merge branch 'master' of https://github.com/sanger/s2_extraction_pipeline into workflow_refactoring
Changed to default labware so that setLabwareFromBarcode returns a promise
Merge branch 'fix_tests' into adding_roles_to_models
Merge pull request #34 from david-allen-tessella/fix_tests

Changed default model so that setLabwareFromBarcode returns a promise
refactored Kit Binding presenter and removed the binding complete presenter. Hooked up printer functionality
Merge pull request #35 from mikemases/Refactoring_Kit_Binding

Refactoring kit binding
removed binding complete view file
Merge branch 'master' of https://github.com/sanger/s2_extraction_pipeline into Refactoring_Kit_Binding
Added a method for creation of spin columns
Merging in Mike's changes
workflow engine update (using the new format of configuration)
Fixed styling issues and functionality
Merge branch 'adding_roles_to_models' of https://github.com/david-allen-tessella/s2_extraction_pipeline into Kit_Binding_Functionality
Merge branch 'adding_roles_to_models' of https://github.com/david-allen-tessella/s2_extraction_pipeline into workflow_refactoring

Conflicts:
	app/scripts/workflow_engine.js