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
Add username to unit test JSON. Add username to root, and searches requests.
Change "user" attribute to "username" in root
Add username to unit test JSON. Add username to root, and searches requests.
Change "user" attribute to "username" in root
Refactored s2_batch to use chained promises, rather than nested
promises
Merge branch 'newjson_with_username' of github.com:bowcot84/S2Mapper into newjson_with_username
Merge pull request #36 from bowcot84/newjson_with_username

Add username to unit test JSON. Add username to root, and searches reque...
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
The role in tube.order crept back in again
Merge pull request #39 from mattdenner/remove_role_from_tube_order

The role in tube.order crept back in again