Fixed Analytics errors
Merge branch 'develop' of github.com:webhat/Working-Title into develop