Updates with yeoman generator.
Merge updates.