#4 one-to-one composition using uid's
Merge branch 'master' of https://github.com/mihaistoie/sikia