Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/Test.java
Merge branch 'master' of https://github.com/taojintianxia/Incubator.git