添加图示
Merge remote-tracking branch 'origin/master'

Conflicts:
	spring-integration-amqp-publish/README.md