various changes
Merge branch 'develop' of https://github.com/5unkEn/TarotSite into develop