SuperManager写了一个页面
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/IndexPage/Index.php