fix Click event
remove comment
Merge remote-tracking branch 'origin/HEAD'
move simplelayoutengine