add some font function

laivi

2013-01-21
Merge branch 'master' of https://github.com/laivizhu/myGit.git

Conflicts:
	knowledge/WebRoot/common/navigate.jsp
	knowledge/WebRoot/js/basic.js
	knowledge/WebRoot/knowledge/article_view.jsp
	knowledge/WebRoot/knowledge/knowledge.jsp
	knowledge/src/com/laivi/knowledge/basic/interceptor/HistoryRecordInterceptor.java
	knowledge/src/com/laivi/knowledge/knowledge/action/ArticleAction.java
	knowledge/src/struts.xml