Merge branch 'hotfix-0.3.1' into develop
Add Statcounter and Google webmaster tools code
Merge branch 'hotfix-0.3.2' into gh-pages