some fixes
mergfix
Merge branch 'develop' of https://github.com/ayaigame/ayai-frontend into develop