Added some styling
work some more
added script in pricematches/add to deal with urls
Fixed url script
postage table functional added
conflict work merge
Added preliminatry email component
Merge branch 'Juls_Branch'
Added comments and created field in pricematch/view
Merge branch 'Juls_Branch'
Added script to prevent negative quantity
Merge branch 'master' into rob_branch

Conflicts:
	View/Estimators/index.ctp