commiting changes before merging
Merge https://github.com/cfredmond/trade2
updated OrdersController