Merge branch 'develop'
corrected trackEvent params
corrected trackEvent params
corrected trackEvent params
loop through options for select