Infer role from order
Removed redundant whitespace
Merge branch 'master' of https://github.com/sanger/S2Mapper into T45_3_batch_save

Conflicts:
	app/scripts/mapper/s2_batch_resource.js
	app/scripts/mapper/s2_tube_resource.js
	test/test_config.js

Post merge
Batch save promise does not resolve until all orders have been updated
Merge remote-tracking branch 'sanger/master' into T45_3_batch_save

Conflicts:
	app/scripts/mapper/s2_batch_resource.js

Resolution of merge from master
Refactored s2_batch to use chained promises, rather than nested
promises
Merge branch 'master' of https://github.com/sanger/S2Mapper into T45_3_batch_save

Conflicts:
	app/scripts/mapper/s2_tube_resource.js
Merge pull request #38 from iain-peddie-tessella/T45_3_batch_save

Batch promises wait for orders