Minor bugfixes
Merge branch 'master' of git://github.com/ManocLabs/manoc

Resolved Conflicts:
	root/src/iprange/iplist.tt
Hotfix to uplinks identification of Netwalker.