Updating NPM account email address
increasing version
Merge branch 'master' into dbatiste/input-mixin-refactoring

Conflicts:
	package.json