Merge branch 'development'
adds analytics tracking event to Hammered Time Rules button
Merge branch 'master' into development