New updates

Signed-off-by: Vincent Lau <vincent@paywhere.com>
Merge branch 'master' of https://github.com/stiucsib86/happiness-app