changed di wrapper class behavior
changed di wrapper unittest class
removed config files depended other class
Merge branch 'feature_20140306' into develop