Stefan fix - return filetree
Merge remote-tracking branch 'origin/stagstededits'

Conflicts:
	AppLayer.cpp
	AppLayer.h
	Makefile
	PhysicalLayerEmu.cpp
	README.md