us32 - bug fix
Merge branch 'dev' of https://github.com/danidanone17/YinYangApp into dev