Merge branch 'master' of https://github.com/tsukasa-web/generator-giraffe

Conflicts:
app/templates/_package.json
fix package.son