Conflicts:

	floodlight/build.xml
	floodlight/src/test/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImplTest.java

Remove three dependent libraries accordingly.

Google Guava is a general purpose utility library that simplifies common
tasks like handling strings (joining/parsing), collections (chaining
iterators), helpers for writing equals/hashcode etc.

Apache 2 licensed

http://code.google.com/p/guava-libraries/

Workaroudn to get rid of warnings in generated thrift code.
Modify gen-thrift ant target to add a SupressWarnings("all") to all
generated java file (we do a regex replace.)

Also retab'ed build.xml file

Fix build issues caused by the introduction of PacketFactory. Now the net.floodlightcontroller.core.test.* files will not try to be run as jUnit tests.

Now with all relevant files added!

[#26756797]

Move packetstreamer classes into main source directory.  Make all generated files in target directory