fixed controllers, added migrations and joint tables
Merge pull request #6 from slwaller/master

fixed controllers, added migrations and joint tables