merge from release1.0
rename test file:
add a config file
delete a unused config file
merged from dev