Refactoring header and replacing Google analytics code.
Merge branch 'hotfix/1.0.1'