Merge branch 'develop' of https://github.com/ufo22940268/DropRefreshView into develop

Conflicts:
	demo.apk