Merge pull request #366 from kwanggithub/master

Floodlight subtree update
Fixed unsave ant warnings and cleaned up a few things
Merge pull request #367 from Sovietaced/sovietaced

Fixed unsave ant warnings and cleaned up a few things
Adding copyright statements