Add streamhub-deck resources (images, css, streamhub-deck.almond.js)
Resolve conflicts