import new files
changed dao
changed entity
changed mapping
changed test
update function names
Merge branch 'feature/include_chenxin_svn' into feature/module_choice
use moduleID instead of moduleSlug