Merge branch 'master' into dibel-develop
change font, show current directory name
Merge branch 'dibel-develop'