合并
Merge branch 'master' of https://github.com/songzx/water.git

Conflicts:
	water/luceneexample/.classpath
	water/luceneexample/pom.xml
	water/pom.xml
	water/rqcodeexample/.classpath
	water/rqcodeexample/.settings/org.eclipse.core.resources.prefs
	water/rqcodeexample/.settings/org.eclipse.wst.common.component
	water/rqcodeexample/.settings/org.eclipse.wst.common.project.facet.core.xml