Merge pull request #404 from goldrush/master

逆マージ
AND検索
Merge pull request #405 from qtamaki/develop

AND検索
Merge pull request #406 from goldrush/develop

Develop