Rename sample config file
Merge branch 'master' into system_menu