Merge branch 'master' of https://github.com/renfj2006/VineServer

Conflicts:
	vine-common/src/main/java/vineyard/App.java