1
Merge branch 'master' into Michael

Conflicts:
	project/HUT/src/com/hut/action/XslqAction.java
	project/HUT/src/com/hut/service/LessonService.java
	project/HUT/src/struts.xml