Change-Id: Ic6d7a70390e780cbb7cae75b4ccb89ea3485a71d
Merge branch 'master' of https://github.com/zuoyebushiwo/my.git

Conflicts:
	src/com/zuoye/base/createobject/Client.java
	src/com/zuoye/nio/FastCopyFile.java
	src/com/zuoye/nio/nio_read_write/CopyFile.java
	src/com/zuoye/nio/nio_read_write/common/CopyFile.java
	src/com/zuoye/pattern/adapter/ChinesePower.java
	src/com/zuoye/pattern/adapter/ComputerPowerAdapter.java
	src/com/zuoye/thread/Test.java
	src/com/zuoye/thread/high/current/lock/reemtractreadwritelock/ReentrantReadWriteLockTest.java
	src/com/zuoye/thread/high/current/lock/reentrantlock/LockTest.java