changed price calculation. added optional global markup on material input changed material - item relationship to ManyToOne from OneToOne for deleting purposes