we weren't __bridging
Merge branch 'refs/heads/master' into ARC_hotfix

Conflicts:
	iOS/Framework/AppBlade/AppBladeSimpleKeychain.m