fix conflicts with ViewPager
erge branch 'master' of github.com:laowch/PullToBack