* Working on cocktail add
* Working on cocktail add
Merge branch 'develop' of github.com:SaltySoft/happy_hours into develop

Conflicts:
	HappyHours/Scripts/HhJavascripts/Views/MainView.js