fix database relations

@nudded just explained to me how I should use many-to-many relations in the
models. So I applied that.
Merge branch 'master' into fix-db-associations

Conflicts:
	Isengard/app/models/zone.rb
Merge pull request #6 from ZeusWPI/fix-db-associations

fix database relations