Content updates
Merge branch 'smc-design' of github.com:triblondon/edgeconf into smc-design