galleryの変更
Merge branch 'master' of https://github.com/SmailHackathon/SmileHackathon
activitiy_cameraの変更