Fix link refs
Merge branch 'master' of github.com:triblondon/edgeconf
Merge branch 'master' of github.com:triblondon/edgeconf
Merge branch 'master' of github.com:triblondon/edgeconf
Resolve conflicts
Merge branch 'master' of github.com:triblondon/edgeconf