Merged code from the master branch
Merge branch 'gh-pages' of git@github.com:earthperson/Webtags.git into gh-pages