comment model added
fixed conflicts
comments added on projects
resolved conflict in project_comments
mugshot edit added