ggwp
Merge branch 'master' of https://github.com/CKP-webservice/eXceedVote-restful

Conflicts:
	src/exceedvote/resource/ExceedVoteResource.java