Removing unused method
Merge remote-tracking branch 'origin/master' into socialcoffee

* origin/master:
  Bo work
Adding new templates
Adding more than one comment type
adding changes
Save work
a
adding changes
Fixing the comments