Merge branch 'master' into develop
Use Mixpanel Analytics instead of Google Analytics
Merge branch 'develop'