admin pages changed
Merge remote-tracking branch 'origin/master'

Conflicts:
	template/admin_class.php
	template/admin_teachers.php