Update models.py - added order set
Update models.py - fixed order set issues
Update models.py - use User for location
Merge remote-tracking branch 'origin/master' into models-mockup
updated costs and users models and created south migrations