Updated place order so you cant place an empty order.
Merge origin/master