Add line items controller
merged master and resolved conflicts