Added drink and drink controller.
Multiple arguments for drink controller.
Merge remote-tracking branch 'origin/master'