Merge branch 'master' of https://github.com/fldpi/SoberApp

Conflicts:
	SoberApp/app/src/main/res/layout/activity_main.xml
Merge branch 'master' of https://github.com/fldpi/SoberApp

Conflicts:
	SoberApp/app/src/main/res/layout/activity_main.xml
Merge branch 'master' of https://github.com/fldpi/SoberApp

Conflicts:
	SoberApp/app/src/main/res/layout/activity_main.xml
Merge branch 'master' of https://github.com/fldpi/SoberApp