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

windows assets fix
bump version for release
fixed empty collection rendering
Merge pull request #77 from jstrimpel/collection-rendering-fix

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

updated hapi version
merge master