mapkit integration
Merge remote-tracking branch 'Remote/master'