Mein letzter Status...
Mergy Merge
Merge branch 'master' of https://github.com/Rarzarol/PaPEr

Conflicts:
	Ppaper/src/com/roman/ppaper/UI/CharAnzeigeActivity.java