edit Logo.mxml
edit main design
edit skins for buttons
Merge branch 'master' of https://github.com/Crabar/my-cocktails

Conflicts:
	client/src/main/flex/bin-debug/Main.swf