added associations and more
Merge branch 'master' of github.com:maxsong1002/edubyme