* merging.
Merge branch 'develop' of github.com:SaltySoft/happy_hours into develop
* add error user creation handle client side.
* merging.