Clean somthing
Merge remote-tracking branch 'origin/master'
Add file layout for settings activity menu
change files for notification
change something in display
change settings
almost change
almost change