提交sliding
Merge branch 'master' of https://github.com/zkqcommon/qfen-android.git

Conflicts:
	project/appcompat_v7/bin/android-support-v7-appcompat.jar