Added event tracking
Merge branch 'master' of github.com:smidig/conference-app
updated texts