Fix merge commits.
Fix merge commits.

Conflicts:

	myfedora/lib/app_factory.py

fedora-infra/fedora-packages,Fale/fedora-packages,fedora-infra/fedora-packages,fedora-infra/fedora-packages,Fale/fedora-packages,fedora-infra/fedora-packages,Fale/fedora-packages