daotest bug:not import dao
Merge branch 'master' of github.com:zzz531/hibator

Conflicts:
	resources/generatorConfig.xml