change the algorithm of subject_arrange
fix bug of xls
add useremail
Merge branch 'develop'