Renamed manlan again.
Merge branch 'master' of https://github.com/jeroenh/AutoGOLE-Topologies

Conflicts:
	goles/es.net.xml