Merge remote-tracking branch 'origin/master'

Conflicts:
	build.xml
	src/main/idl/helloservice.thrift