Increase password hash strength
Add Chinese language files
Merge remote-tracking branch 'ilosuna/master'

Conflicts:
	cms/includes/functions.admin.inc.php