Resolve tablet/phone issue, now one APK can be used for both

Conflicts:
	src/org/irmacard/androidverifier/AnimatedArrow.java