Patch contributed by Bruno Medeiros on http://www.redmine.org/issues/2277

Contributed by Igor Zubkov, extracted from Redmine.

#author doesn't show the author of the journal but of the journaled object.

(Sorry for the commit-noise)

Rip faster_csv out of lib into the Gemfile. #517

[#573] acts_as_searchable definition in WikiPage may be insufficient and cause SQL errors

The pdf export tried to export the initial journal, which it shouldn't.

Invalid watcher user error when adding an invalid user as watcher #577

Taken from Redmine r5880
Committed by Jean Philippe Lang

Conflicts:
	app/helpers/repositories_helper.rb

Conflicts:
	app/views/wiki/annotate.rhtml
	app/views/wiki/diff.rhtml
	app/views/wiki/show.rhtml