123
Merge branch 'master' of git@github.com:jeffywon/COS.git

Conflicts:
	flows/amqp.mflow
	pom.xml
	src/main/app/amqp.xml
123