final screen & merge
Merge branch 'vonwoesfunktioniert' of https://github.com/ssoima/smartprezI into vonwoesfunktioniert

Conflicts:
	wear/src/main/java/com/hackathon/presenta/step_1.java