changed merge routine of the host list. (avoid conflict with mac addresses which have same hostname)
Merge branch 'network-update'