it support
it support
Merge branch 'cards'

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/lmu/appnight/PersonKo/PersonKoActivity.java
	app/src/main/res/values/strings.xml