ScrollView Demo

Test the scrollView delegate .
Merge branch 'master' of https://github.com/cszwdy/MyDemo

Conflicts:
MyDemo/MyDemo.xcodeproj/project.pbxproj
MyDemo/MyDemo/EMDataManager.m
sync conflict