修正一些bug。log4j的配置问题
去掉system.out输出
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/harlankuo/hyacinth/wcms/web/interceptor/LoginAnnotationInterceptor.java
	src/main/resources/spring/mvcContext.xml