Merge branch 'master' of github.com:silexlabs/Cocktail
Merge branch 'master' of github.com:zabojad/Cocktail