Static content and demo beacons added
Merge commit 'ad80b932ed78c264fc9b92b29734824c128430a0'