added imageId to the Cocktail-class
Merge branch 'master' of github.com:sawise/Pub