schema change
Merge branch 'master' of https://github.com/haiwangcat/roadtrip

Conflicts:
	roadtrip/roadtrip/models.py
schema migration files