adding a test change for diffing with master
reverting last change
Merge branch 'development'
Updating code to recommit html5 messaging for setting event data of a timeline
Fixing conflicts from merge with development of html5 messaging for setting event datat