samereq style
Merge branch 'master' of https://github.com/goeb/req

Conflicts:
	src/renderingHtml.cpp