* merging.
Merge branch 'develop' of github.com:SaltySoft/happy_hours into develop
* upgrade query with ingredients.
Merge branch 'develop' of github.com:SaltySoft/happy_hours into develop