Merged from master 70c3e1c8

Conflicts:

	app/helpers/application_helper.rb

move protect_from_forgery to the beginning of the before_filter chain as per the recommended rails practices

Merged from master d7a9adf8

Conflicts:

	app/controllers/application_controller.rb

Contributed by MAEDA, Go

Added view hook for additional wiki formats [refs #488]

Conflicts:
	app/views/help/wiki_syntax_detailed.html.erb
	public/favicon.ico

Conflicts:
	lib/redmine/scm/adapters/subversion_adapter.rb

* Allows plugins to add to the list of supported export formats at the
  bottom of the Wiki#show view template