Making Settings available on the action bar
Merge branch 'master' of https://github.com/d-gubert/testapplication