Remove conflict Default.png file & localizable file
Merge pull request #4274 from indevizible/master

Remove conflict Default.png file & localizable file