* Merging
Merge branch 'develop' of github.com:SaltySoft/happy_hours into develop
Merge branch 'develop' of github.com:SaltySoft/happy_hours into develop