add models and add/edit join tables
Merge pull request #4 from maebeale/release-1

add models and add/edit join tables
Merge remote-tracking branch 'upstream/release-1' into release-1