Add comments model
Resolve index problem
Merge Comments with Develop