added sound option for settings
Merge branch 'nav-controllers'
merged nav controllers branch