Fix studentclassmessage jaxb problem
Merge drop
Merge drop client
Merge permission-ruibi client
Merge permission-ruibi service
Fix web.xml merge problem
Fix conflict by editing jax-ws
Fix conflict by editing jax-ws
Merge origin/master

Conflicts:
	CourseManagementSystem/nbproject/jax-ws.xml
	CourseManagementSystem/nbproject/jaxws-build.xml