2.0.20 Add $20 shipping fee to order
Merge branch '2.0.20'