Merge develop into our jhipster branch

This should sync up with Michelle's work and my recent build changes.

Please review, and figure out which part's of Michelle's stuff to merge.