synchronize the libs in 2 project
Merge branch 'master' of https://github.com/lzq8272587/GitHub-LZQ.git

Conflicts:
	library/libs/android-support-v4.jar