one draft of app
added the component.json
Merge branch 'master' of github.com:sanger/s2_extraction_pipeline into first_draft

Conflicts:
	.gitignore
	component.json

added tests for the default presenter
Merge branch 'master' of github.com:sanger/s2_extraction_pipeline into first_draft

Conflicts:
	app/index.html
	app/scripts/main.js
	app/scripts/models/selectionPageModel.js
	test/index.html
	test/spec/selectionPageSpec.js
	test/test_main.js
Added view for selection page
Merge branch 'T54_MVP_for_scan_barcode' of github.com:iain-peddie-tessella/s2_extraction_pipeline into first_draft
Added support for S2Mapper integration
add .orig to .gitignore
rename spec files in test_main
Added view for selection page
workable draft app (using a dummy resource as mapper), with the interfaces for pagepresenter that should be stable...

+ Merge branch 'master' of github.com:sanger/s2_extraction_pipeline into first_draft

Conflicts:
	app/index.html
	app/scripts/main.js
	app/scripts/models/selectionPageModel.js
	test/index.html
	test/spec/selectionPageSpec.js
	test/test_main.js
Merge pull request #3 from benoitmangili/first_draft

First draft
WIP: Changes for S2Mapper test data
Initial work on scan barcode presenter
direct output from merge
Merge branch 'T54_MVP_for_scan_barcode' of github.com:iain-peddie-tessella/s2_extraction_pipeline into add_tube_selection_presenter

Conflicts:
	app/scripts/main.js
	app/scripts/presenters/selection_page_presenter.js
integration of the selection_page_presenter into the app
working app following merge
Added flash aside to index page
Merge pull request #4 from seandunn/add_flash_area_to_index

Adds a flash aside to index page