update fedora
Merge branch 'master' of https://github.com/daniphp/puppet

Conflicts:
	fedora_common.pp