Merge pull request #3 from HollyDAI/master

6.2
xr的bug，以及courseSettingServlet中User写死已改过来
Merge pull request #4 from HollyDAI/xr

Xr