maven
deploy
Merge branch 'master' of https://github.com/wsw0108/restservlet

Conflicts:
	restservlet/.gitignore