Download Page
Merge branch 'origin/master'

Conflicts:
	application/modules/default/models/Cate.php