对部分模块的缓存机制进行了改进，默认都采用拦截的形式，和业务代码解耦合。
Merge branch 'master' of https://github.com/waitwind/jinhe-daodao

Conflicts:
	framework/src/main/java/com/jinhe/tss/framework/component/cache/CacheInterceptor.java
	framework/src/main/java/com/jinhe/tss/framework/web/dispaly/grid/GridTemplet.java
	framework/src/main/java/com/jinhe/tss/framework/web/dispaly/xform/XFormTemplet.java
	framework/src/test/resources/META-INF/cache.xml
	portal/src/main/java/com/jinhe/tss/portal/action/NavigatorAction.java
	portal/src/main/java/com/jinhe/tss/portal/action/PortalAction.java
	portal/src/main/java/com/jinhe/tss/portal/service/impl/NavigatorService.java
	portal/src/main/java/com/jinhe/tss/portal/service/impl/PortalService.java
	portal/src/main/resources/META-INF/cache.xml
	um/src/main/java/com/jinhe/tss/um/dao/impl/ResourceTypeDao.java