Merge branch 'master' of https://github.com/hjmu/incu.git

Conflicts:
	inc2_tw2/WebContent/WEB-INF/applicationContext.xml
	inc2_tw2/WebContent/WEB-INF/spring-mvc-servlet.xml
	inc2_tw2/src/com/inc/controller/TalkNotesController.java
	inc2_tw2/src/z/Test.java
Merge branch 'master' of https://github.com/hjmu/incu.git