add sticky option for event
try to fix some problems
add sticky option for event
merge some conflicted files
Merge remote-tracking branch 'origin/master'