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

Conflicts:
	HappyHours/Content/AppDesign/cocktail_creation.css
	HappyHours/Scripts/HhJavascripts/Views/CocktailCreation.js