second update
Merge branch 'master' of https://github.com/avuranok/Network-Discovery-and-Monitoring-System-Team-3

Conflicts:
	senior-prototype-interface/src/NDMSMain/CdpDiscovery.java
	senior-prototype-interface/src/NDMSMain/DiscoveryOperation.java
	senior-prototype-interface/src/NDMSMain/LldpDiscovery.java
	senior-prototype-interface/src/NDMSMain/frame1.java
	senior-prototype-interface/src/NDMSMain/functions.java
	senior-prototype-interface/src/SNMPHandler/SNMPAgent.java
	senior-prototype-interface/src/SNMPHandler/SNMPManager.java
	senior-prototype-interface/src/SNMPHandler/SNMPWalk.java
	senior-prototype-interface/src/SNMPHandler/walktest.java
	senior-prototype-interface/src/TopologyHandler/DrawTopology.java
	senior-prototype-interface/src/TopologyHandler/WriteXMLFile.java
	senior-prototype-interface/src/dbHandler/SQLiteJDBC.java
	senior-prototype-interface/topology.xml