Merge branch 'conversions' into development
conversions with rebates and markup
conversion price updates when fixture changes
update todo
Merge branch 'development'