Merged class Drop into DropController

closes #112.

* Moved functions from Drop.java into DropController.java
* Deleted Drop.java
* Renamed DropTest.java to DropControllerTest.java
Has this been done to not have multi threading issues or why do you need another instance of ```DropController```?