removed settings menu, not needed
Merge branch 'master' into add_sync