merging work with Mainframed
Merge branch 'master' of
https://chief4scot@github.com/chief4scot/metasploit-framework.git

Conflicts:
	modules/exploits/zarch/zos/ftp_jcl_app.rb
	modules/payloads/singles/zos/zarch/shell_reverse_tcp.rb
Added data file "catso.rexx" to be used when generating payload
JCL, instead of hard coding into reverse tcp
Merge branch 'master' of
https://chief4scot@github.com/chief4scot/metasploit-framework.git

Conflicts:
	modules/exploits/zarch/zos/ftp_jcl_app.rb
	modules/payloads/singles/zos/zarch/tso_reverse_tcp.rb