itineraries model changes
Merge branch 'master' of https://github.com/qasimaslam/tripscanner

Conflicts:
	trips/models.py