freemarker 全局变量
freemarker 全局变量
静态文件
Merge branch 'github-sunblog/master'

Conflicts:
	src/main/java/com/sun/blog/sunblog/base/MyConstants.java
	src/main/resources/applicationContext-common.xml
	src/main/resources/spring/applicationContext-view.xml
	src/main/webapp/index.jsp
修正合并错误