Merge pull request #2 from kiddkai/master

upmerge
add resize bar to the main view
conflicts resolved
Merge branch 'kuddkai-master'
Merge pull request #3 from LeiZeng/master

add resize bar