Merge branch 'master' of github.com:gboudrias/hosting_network