Change bower.json and package.json to 2 spaces

Those two files have specific editorconfig configuration, because Bower doesn't respect existing formatting and forces to have 2 spaces indentation

Fix #634
Merge branch 'master' of github.com:jhipster/generator-jhipster