gemerged digga
Merge branch 'master' of https://github.com/Schnuette/GrandmaApp.git

Conflicts:
	GrandmaApp/src/com/grandmaapp/activities/GrandmaActivity.java