changed method signature, use bottleCount from server response when taking bottles
added test for bottle-type-display directive
Merge branch 'master' of https://github.com/sebauer/schluckspecht