Big update
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/school.class.php
	model/memberloginModel.php
	views/theme/xpanel/app_tkb.php