+++Listview ausgabe formatierung ge�nder+++
Merge branch 'master' of https://github.com/Berserker88/duelp

Conflicts:
	app/gen/com/google/android/gms/R.java
	app/google-play-services_lib/bin/google-play-services_lib.jar
	app/src/de/jasiflak/duelp/Duelp.java