Merged with Master
Merge branch 'master' into darren
Stock now subclass of product, and product ID removed.
IDs now associated with Sales and Orders, not Invoices.
Sale and Order changed accordingly to changes with product and stock
classes.
Merge branch 'master' into darren