Merge branch 'hotfix/java7fix'
Fixed javascript with final changes for analytics to recod successfully for all events
Merge branch 'hotfix/analytics' into develop