Merge branch 'hotfix-1.1' into develop
Added Analytics to All Templates
Merge branch 'analytics' into develop
Merge branch 'develop'

message to explain why this merge is necessary,