removing unnecessary code and updateing template
Merge branch 'master' into gh-pages

* master:
  removing unnecessary code and updateing template