buttons bugs solved
Merge remote-tracking branch 'origin/gota' into gota
po
Merge remote-tracking branch 'origin/gota' into gota