Sync with cktricky changes
Merge branch 'xss-dev2' of https://github.com/KINGSABRI/xss-sploit into xss-dev2

Conflicts:
	.history
	lib/xss/ui/console/shell/shell_core.rb