modal window
fixing merge conflict
fixing conflict
Merge pull request #21 from dmitryshilin/order_controller

Order controller