6.28
Merge branch 'origin/master'

Conflicts:
	application/language/chinese/chinese_lang.php
	application/views/recover.php