Fixed model names in relations
Merge origin/master