Fix arrow size on Nexus S
Merge branch 'master' of github.com:credentials/irma_android_verifier
Merge branch 'master' of github.com:credentials/irma_android_verifier
Drop conflict file added by accident