123456
Merge branch 'master' of https://github.com/luqizheng/Qi4Net

Conflicts:
	src/Qi_src/Qi.NHibernateExtender/Domain/NHibernates/DaoBase.cs