Favoriten-Funktion soweit eingefuegt
Merge branch 'topicposts'

Conflicts:
	config/routes.rb
	solr/data/development/index/_j.fdt
	solr/data/development/index/_j.frq
	solr/data/development/index/_j.nrm
	solr/data/development/index/_j.prx
	solr/data/development/index/_j.tis
	solr/data/development/index/segments.gen
gitignore solr data and pids dir
Breadcrumbs.html.erb geloescht
log file in slr/data
Merge branch 'master' of github.com:Godfather1408/fancy_forum
Validations in Posts entfernt, da man sonst kein Topic anlegen kann
cat_id wird auch in topics/edit mitgegeben
Merge branch 'master' of github.com:Godfather1408/fancy_forum

Conflicts:
	log/sunspot-solr-development.log.1
sunspot logs werden ignoriert
Merge branch 'steffen' of github.com:Godfather1408/fancy_forum into steffen