Refactoring header and replacing Google Analytics code.
Merge branch 'hotfix/1.0.1' into development