Fixed bug when adding new event.
Merge branch 'castor/alpha'
Fixed plugin bugs.