analytics tag, made 2 aspx
Merge branch 'hotfix/1.2.1'