app delegate
Merge remote-tracking branch 'iOS/master'