Merge branch '1page' of github.com:finalsclubdev/FinalsClub into 1page