Adding a generator for the composition model
Merge branch 'master' of https://github.com/andyed2003/aegit