XML changes
Merge branch 'master' of https://github.com/gwtrains/comRTIPTours

Conflicts:
	admin/models/forms/tour.xml