merge conflict removed
added placeholder image to stream
Merge branch 'feature/showrca2014' of github.com:torchbox/verdant-rca into feature/showrca2014

Merged with origin.
Merge remote-tracking branch 'origin/feature/showrca2014' into staging