Merged class Drop into DropController

closes #112.

* Moved functions from Drop.java into DropController.java
* Deleted Drop.java
* Renamed DropTest.java to DropControllerTest.java
No. This part is just the merge of these classes. reducing the number of instances is another issue and should be therefore another pull request.