Version bump
Merge branch 'master' of github.com:evertrue/et_haproxy-cookbook

Conflicts:
	CHANGELOG.md