fix bugs
Merge branch 'fixbugs'

Conflicts:
	SVPullToRefresh/UIScrollView+SVPullToRefresh.m