Merge branch 'master' of https://github.com/lzq8272587/GitHub-LZQ

Conflicts:
	library/libs/android-support-v4.jar
Merge branch 'master' of https://github.com/lzq8272587/GitHub-LZQ.git