maven
haproxy
Merge branch 'master' of https://github.com/BoxUpp/Puppet-Modules

Conflicts:
	haproxy/metadata.json