Commit commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	THS_mobileWeb/src/main/webapp/WEB-INF/css/button.css
	THS_mobileWeb/src/main/webapp/WEB-INF/css/index.css
	THS_mobileWeb/src/main/webapp/WEB-INF/css/menu.css
	THS_mobileWeb/src/main/webapp/WEB-INF/css/table_layout.css
	THS_mobileWeb/src/main/webapp/WEB-INF/css/table_layout2.css
	THS_mobileWeb/src/main/webapp/WEB-INF/css/table_layout3.css
	THS_mobileWeb/src/main/webapp/WEB-INF/views/courseEnroll/course_enroll.jsp
	THS_mobileWeb/src/main/webapp/WEB-INF/views/myClass/class_board.jsp
	THS_mobileWeb/src/main/webapp/WEB-INF/views/myClass/class_board_list.jsp
	THS_mobileWeb/src/main/webapp/WEB-INF/views/myClass/class_board_read.jsp
	THS_mobileWeb/src/main/webapp/WEB-INF/views/nav/class_nav.jsp
	THS_mobileWeb/target/m2e-wtp/web-resources/META-INF/maven/org.springframework.samples.service.service/THS_mobileWeb/pom.properties