a
Merge branch 'master' of git@github.com:jinweile/java.git

Conflicts:
	ticketofficeservice/src/ticket/office/comm/HttpRequest.java