moved broker config to short name
updated modules images
Merge remote-tracking branch 'origin/blogdev' into blogdev