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 pull request #371 from emrojo/development

Modifies presentResource for not using an empty object
Merge branch 'uat' into development

Conflicts:
	app/scripts/lib/reception_templates/filter_paper/manifest.xls
	app/scripts/lib/reception_templates/readers.js
Bump jQuery version number
Corrects type of model in pipeline.
Correction of svg content for displaying barcode and
showing wells content.
Took out Coffeescript task from 'grunt server' task
as we are not using coffeescript
Modified livereload task in Grunt so it reloads when modifying
files in app-components directory. Was originally only reloading for app
directory and one level down which meant app-components was not included
Fixed the tests

Modified a lot of the fixture data so they now represent
the calls made by the selection page. Fake user also had
its event changed as for some reason keypress was not
working.
Removed cucumberjs from Grunt testAll task

This is failing our tests. No reason to have it included
at the moment because there are no features written.