[npm] bump hapi version
Merge remote-tracking branch 'upstream/master'

Conflicts:
	package.json