added network service indicator and dialog for ambiguous service match between
two unroutable networks
Merge branch 'network-prototype' of github.com:juju/juju-gui into network-prototype

Conflicts:
	app/views/topology/relation.js
Merge pull request #65 from bradleyjones/network-prototype

added network service indicator and dialog for ambiguous service match b...