modals finished
Merge branch 'master' of https://github.com/AppleTreker/cscsi-network-manager

Conflicts:
	views/topology.erb