Fix for AMEX 4 digits code delegate
Fixed __weak not compatible with ARC
Merge remote-tracking branch 'upstream/master'

Conflicts:
	PaymentKit/PKView.m