Merge branch 'master' of https://github.com/zomeki/zomeki-development
Change ranking search condition
Merge branch 'master' of https://github.com/ozamasa/zomeki-development into ozamasa-master