comment model setup
Merge branch 'comments'