timer/multiple frame
Merge branch 'master' of https://github.com/cantas/Network-Discovery-and-Monitoring-System

Conflicts:
	senior-prototype-interface/bin/NDMSMain/CdpDiscovery.class
	senior-prototype-interface/bin/NDMSMain/ConfigFrame1.class
	senior-prototype-interface/bin/NDMSMain/DiscoveryOperation.class
	senior-prototype-interface/bin/NDMSMain/LldpDiscovery.class
	senior-prototype-interface/bin/NDMSMain/frame1$1.class
	senior-prototype-interface/bin/NDMSMain/frame1$2$1.class
	senior-prototype-interface/bin/NDMSMain/frame1$2$2.class
	senior-prototype-interface/bin/NDMSMain/frame1$2.class
	senior-prototype-interface/bin/NDMSMain/frame1$3.class
	senior-prototype-interface/bin/NDMSMain/frame1$4.class
	senior-prototype-interface/bin/NDMSMain/frame1$5.class
	senior-prototype-interface/bin/NDMSMain/frame1$6$1.class
	senior-prototype-interface/bin/NDMSMain/frame1$6.class
	senior-prototype-interface/bin/NDMSMain/frame1$7.class
	senior-prototype-interface/bin/NDMSMain/frame1$8$1$1.class
	senior-prototype-interface/bin/NDMSMain/frame1$8$1.class
	senior-prototype-interface/bin/NDMSMain/frame1$8.class
	senior-prototype-interface/bin/NDMSMain/frame1$9$1$1.class
	senior-prototype-interface/bin/NDMSMain/frame1$9$1.class
	senior-prototype-interface/bin/NDMSMain/frame1$9.class
	senior-prototype-interface/bin/NDMSMain/frame1.class
	senior-prototype-interface/bin/TopologyHandler/DrawTopology$1.class
	senior-prototype-interface/bin/TopologyHandler/DrawTopology.class
	senior-prototype-interface/src/NDMSMain/DiscoveryOperation.java