updated hapi
Merge branch 'master' into hapi-update
Merge branch 'master' into hapi-update
updated hapi version
Merge pull request #78 from jstrimpel/hapi-update

updated hapi version