Changed a lot of fedora related files. Solr indexing works now.
Merge remote-tracking branch 'origin/master'

Conflicts:
	fedora4.sh