Fixed #3860: A warning message is proposed when name conflict detected in plist files
Update samples
Merge pull request #1527 from pandamicro/develop

Fixed #3860: A warning message is proposed when name conflict detected in plist files