resolve-merge gamupet#305

ayudaV wants to merge 3 commits into

mastermoraguma/GamutoWare:masterfrom

merge_jogo_tamiresmoraguma/GamutoWare:merge_jogo_tamiresCopy head branch name to clipboard