Merge branch 'hotfix_2.1'
Version 2.2

Updated Google Analytics code
Version 2.2.1
Merge branch 'master' into develop