update events page
Merge branch '1.0.4'