more changes for framework
Merge remote-tracking branch 'origin/jfusion2.0' into jfusion2.0