Update to jhipster master