fix resize bug
merge from baidu
add todo list
Merge branch 'baidu'