+++onResume eingebaut+++
Merge branch 'master' of https://github.com/Berserker88/duelp

Conflicts:
	app/src/de/jasiflak/duelp/Duelp.java