add country field to ShippingAddress model
Merge branch 'master' of github.com:pettazz/JACKED