added transitioning window between events; cleaned up delegate h/m files
Merge remote-tracking branch 'origin/master'