update hosts
Merge branch 'develop'