good2000mo
Merge remote-tracking branch 'upstream/master'

Conflicts:
	aaa/admin_bans.php
Merge pull request #4 from good2000mo/master

ok