KeyError issue commit.
Fixed keyerror issue
Merge branch 'keyerror_issue'

Conflicts:
	trucking_project/myauth/customauth/models.pyc
	trucking_project/myauth/myauth/settings.pyc
	trucking_project/myauth/shipping/models.pyc