Merge branch 'master' into dev
new conf
for father bug fixed
Merge branch 'dev'