Fixes.
Merge branch 'master' of https://github.com/stiucsib86/happiness-app