Add trimming of image
Merge branch 'master' of github.com:ozamasa/zomeki-development into ozamasa-master
Merge branch 'ozamasa-master'