Added UA-tracking
Correct tracking codes per tracking type
Updated changelog
remove unused field
Merge pull request #490 from WouterSioen/profiles-fix

remove the avatar field in the profiles settings action
Merge pull request #486 from forkcms/ua-tracking-and-refactoring

Universal Analytics
Merge branch 'master' into 3.6-wip