work some more
postage table functional added
conflict work merge
Merge branch 'Juls_Branch'
Added comments and created field in pricematch/view
Merge branch 'Juls_Branch'
Added script to prevent negative quantity