Fixes reversed promises bug
Merge branch 'development' into uat
Merge branch 'development' into uat
Fix to labware display issue
Fix to labware not displaying correctly (again :)
Merge branch 'development' into uat

Conflicts:
	app/scripts/controllers/labware_controller.js
Merge branch 'development' into uat
Merge branch 'development' into uat
Fix to generation of filter paper manifest
Merge pull request #363 from jbeast/filter_paper_manifest_fix

Fix to generation of filter paper manifest
Remove redundant filter paper template fields
Add Sanger Barcode to manifest
Merge branch 'uat' into development

Conflicts:
	app/scripts/lib/reception_templates/filter_paper/manifest.xls
	app/scripts/lib/reception_templates/readers.js