updated Models
Merge branch 'master' of github.com:mromrell/TravelApp

Conflicts:
	.idea/workspace.xml
	ro-backend/apps/public/models.pyc
fixed untracked files