new class for active event adding added
Merge remote-tracking branch 'origin/master'