Added methods to the line_item for finding matching line items
Fixed the order.merge! method
Refactored order_contents#add_with_option_values
Replaced readonly for select at line_item_decorator
Merge pull request #1 from dointeractive/fix-order-merge

Fix order merge