try to resolve conflicts
Merge branch 'master' of https://github.com/PissProject/PissWebProject

Conflicts:
	src/java/beans/practiceWork/PracticeApproveBean.java
	web/student/view_practice_proposal_student.xhtml
	web/teacher/view_practice_proposal.xhtml