Revert "画面遷移.画面減らした"

This reverts commit 0fe32dcd615df0117793ce517948327e654ac1e6.
Merge branch 'master' of https://github.com/tourism2013/osakana_app