测试
Update App.java

测试增加renfj
测试
Merge branch 'master' of https://github.com/renfj2006/VineServer

Conflicts:
	vine-common/src/main/java/vineyard/App.java
Merge branch 'master' of https://github.com/renfj2006/VineServer

Conflicts:
	vine-common/src/main/java/vineyard/App.java
Merge branch 'master' of https://github.com/renfj2006/VineServer

Conflicts:
	vine-common/src/main/java/vineyard/App.java
Merge branch 'master' of https://github.com/renfj2006/VineServer

Conflicts:
	vine-common/src/main/java/vineyard/App.java
Merge pull request #1 from renfj2006/master

App System