Conflicts:
	CHANGELOG.md
	CONTRIBUTORS.md
	lib/arachni/element/capabilities/auditable.rb
	lib/arachni/element/capabilities/auditable/rdiff.rb
	lib/arachni/element/capabilities/auditable/taint.rb
	lib/arachni/element/capabilities/auditable/timeout.rb
	lib/arachni/element/capabilities/mutable.rb
	lib/arachni/element/capabilities/refreshable.rb
	lib/arachni/element/cookie.rb
	lib/arachni/element/form.rb
	lib/arachni/element/header.rb
	lib/arachni/framework.rb
	lib/arachni/http.rb
	lib/arachni/http/cookie_jar.rb
	lib/arachni/module/auditor.rb
	lib/arachni/page.rb
	lib/arachni/parser.rb
	lib/arachni/rpc/server/dispatcher.rb
	lib/arachni/rpc/server/framework/distributor.rb
	lib/arachni/session.rb
	lib/arachni/trainer.rb
	lib/arachni/typhoeus/response.rb
	modules/audit/path_traversal.rb
	modules/audit/xss_script_tag.rb
	modules/audit/xss_tag.rb
	plugins/defaults/meta/remedies/timing_attacks.rb
	plugins/proxy.rb
	plugins/proxy/server.rb
	reports/metareport....