Settingsactivity for the app is halfway through
Merge branch 'master' of github.com:sawise/SoftwerkCoffee