Added parent activity for settings forbetter navigation flow
Changed if statement and different scope for sharedpreferences settings
Merge branch 'master' of https://github.com/cornedor/mayhem