add dataChoices for tracking
Merge branch 'master' of github.com:MozillaOnline/twhp