added join table and relations
Merge branch 'master' of github.com:fm2munsh/due

Conflicts:
	db/schema.rb