Updated NPM dependencies
Updated yeoman-maven-plugin version
Corrected test
Merge branch 'master' of https://github.com/jhipster/generator-jhipster

Conflicts:
	app/templates/_package.json
	app/templates/_pom.xml
	app/templates/src/test/java/package/web/rest/_AccountResourceTest.java