fix water flow bug in event index page
add relatedevents in event detail page
merge from remote server