Setting environmrnt to apache
Merge branch 'master' of https://github.com/icalvete/puppet-apache2

Conflicts:
	templates/env.erb