Merge branch 'gh-pages'
added googleplus (f462) and camptix (461)
Merge branch 'master' into gh-pages