deleting user defaults and some bugs
changing time settings
Merge soon
Merge branch 'master1'