Merged class Drop into DropController

closes #112.

* Moved functions from Drop.java into DropController.java
* Deleted Drop.java
* Renamed DropTest.java to DropControllerTest.java
Again -- I asked the same(?) question above -- why you do not need this generic anymore. Is this because of the changes in this PR?