Merge from my local version
Add some sample
delete the unnecessary MVPlog path in the sysConfig.xml
conflict resolve
Add the sample file