Changed fork button to a watch/star button
Merge branch 'master' into gh-pages

* master:
  Changed fork button to a watch/star button