fix conflict
gogog
add the student telephone display
add the telephone display
add the telephone
modify the bug
merge school_dev_beta