Fixed(?) .ser conflicts
Merge branch 'darren'
'View sale' button debugged