Merged sflow with netflow. Directories and code undergone major changes.
Removed old directory structures
Merge branch 'master' of https://github.com/Hei2/FlowCollector

Conflicts:
	NetFlow/src/netflow/Functions.java
	NetFlow/src/netflow/Main.java