Fix relation
Rename table
Rename join table
Make model-level many-to-many connection
Remove duplicate relation, add missing one
Initial work on field trips listing in the homepage
Merge branch 'master' of heroku.com:fieldtrip-it

Conflicts:
	app/models/company.rb