new trip types and associations between trips and triptypes
Merge branch 'master' of github.com:BeuthProjects/schreberjugend_rails