Merge branch 'hotfix/1.1'
Merge branch 'release/1.2'
analytics tag, made 2 aspx
Merge branch 'hotfix/1.2.1' into develop