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

* origin/master:
  Bo work
Adding new templates