add friend class to model
Merge branch 'master' into jz