Add CVE-2014-7146 PHP Code Execution for MantisBT
update description and fix typos
Fix issues reported by wchen-r7 and mmetince
Fix issues reported by FireFart
Fix by @FireFart to recover communication with the application after a meterpreter session
Fix #4163 - Update merge_check_key to keep up with 2.1.4 change

The merge_check_key method (found in Msf::Module::ModuleInfo)) uses
respond_to? to check is our object includes a merge_info_description
method before merging descriptions. The respond_to? method in 2.1.4
by default no longer checks private and protected methods, and this
is breaking our merge_check_key method.

Fix #4163
Add gather module for Quake servers
Minor style cleanup
Fix issue reported by FireFart
Fix report_note handling incorrect protocol names
Reduce number of calls to to_s and downcase
some changes
small bugfix
Merge pull request #1 from FireFart/pr1

some changes
Land #4191, merge_check_key update for Ruby 2.1.4
Land #4159, MantisBT PHP code execution by @itseco
Land #4200 - report_note handling incorrect protocol names
Land #4194, Quake protocol support
Adds new TFTP file names, submitted by Chris McNab
Land #4216, @hmoore-r7 additions to the tftp dictionary

* Changes originally submitted by Chris McNab