NFC Quellcode kommentiert
Merge remote-tracking branch 'origin/master'

Conflicts:

	openKeychain/src/main/java/com/haibison/android/lockpattern/WizardActivity.java