Updated the documentation and links to the new website
Merge branch 'master' of https://github.com/jhipster/generator-jhipster

Conflicts:
	app/templates/src/main/webapp/views/main.html