fixed rebase conflicts
Merge pull request #53 from rwarbelow/associations

fixed associations and alias names