修改BasePo
修改框架
Merge branch 'master' of https://github.com/amaoxia/knowledgebase.git

Conflicts:
	knowledgebase/.classpath
	knowledgebase/.settings/org.eclipse.wst.common.component
	knowledgebase/src/main/webapp/WEB-INF/classes/com/bluecloud/component/sys/modules/controller/UserController.class
	knowledgebase/src/main/webapp/WEB-INF/classes/com/bluecloud/component/sys/modules/service/ParamService.class
	knowledgebase/src/main/webapp/WEB-INF/classes/com/bluecloud/component/sys/modules/service/RightsService.class
	knowledgebase/src/main/webapp/WEB-INF/classes/com/bluecloud/component/sys/modules/service/UserService.class
	knowledgebase/src/main/webapp/WEB-INF/classes/com/bluecloud/framework/core/mvc/base/BaseHibernateDao.class
	knowledgebase/src/main/webapp/WEB-INF/classes/com/bluecloud/framework/core/mvc/base/SessionFactory.class
	knowledgebase/src/main/webapp/WEB-INF/classes/com/bluecloud/knowledgebase/modules/controller/UserController.class
	knowledgebase/src/main/webapp/WEB-INF/classes/com/bluecloud/knowledgebase/modules/service/UserService.class