readme
Merge branch 'develop' of https://github.com/danielaborges/hapi-lisbonbigapps-tutorial into develop

Conflicts:
	README.md