Routing config
Merge remote-tracking branch 'origin/master'

Conflicts:
	modules/TestConsumer/TestConsumer.php