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

Conflicts:
	views/network.html