file_uploads as parameter
Merge branch 'master' of https://github.com/icalvete/puppet-roles

Conflicts:
	manifests/apache2_server.pp