moved factorybean classes from config.xml to config package
Merge branch 'master' into DATACASS-52