work in progress commit
Merge branch 'master' into moveSettings
WIP 2
Merge pull request #97 from wtud/moveSettings

moved settings to the navigation drawer