Merge pull request #1 from good2000mo/master

hello2 by good2000mo
Merge pull request #2 from good2000mo/master

hello3 by good2000mo
goodbye by comus
Merge remote-tracking branch 'upstream/master'

Conflicts:
	aaa/admin_bans.php