Fixes on php-shell-*
Merge branch 'master' of github.com:glic3rinu/spam-gear

Conflicts:
	php-shell-scan