upgrade design
Merge branch 'origin/master'

Conflicts:
	client/src/main/flex/src/models/TagsModel.as
	client/src/main/flex/src/views/CocktailView.mxml