'初次提交'
coreFilter
coreFilter
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/com/kin/mvc/Route.java
	core/com/kin/util/LinkTool.java
	webapp/WEB-INF/macro/common.vm
	webapp/WEB-INF/www/soft/index.vm
action
readme
整合
igore
ingore
web.xml
搜索
删除不必要文件
拦截器
拦截器
系统默认拦截器定义
Velocity配置优化
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/com/kin/mvc/control/ActionAnnotation.java
	core/com/kin/mvc/control/ActionContext.java
	core/com/kin/mvc/control/ApacheMultipartRequest.java
	properties/interceptor.properties
	src/net/chinasource/hello/action/WorldAction.java
缓存策略更改
Dao改造
Dao重构